rpms/openoffice.org/devel openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash, NONE, 1.1 openoffice.org.spec, 1.1596, 1.1597

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19577

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash 
Log Message:
Resolves: rhbz#457193 openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash


--- NEW FILE openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash ---
Index: source/ui/inc/TableWindowAccess.hxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/ui/inc/TableWindowAccess.hxx,v
retrieving revision 1.6
diff -u -r1.6 TableWindowAccess.hxx
--- openoffice.org.orig/dbaccess/source/ui/inc/TableWindowAccess.hxx	8 Sep 2005 15:38:21 -0000	1.6
+++ openoffice.org/dbaccess/source/ui/inc/TableWindowAccess.hxx	30 Jul 2008 14:05:20 -0000
@@ -125,6 +125,8 @@
 		{
 			NotifyAccessibleEvent(_nEventId,_rOldValue,_rNewValue);
 		}
+
+		void clearTable();
 	};
 }
 #endif // DBACCESS_TABLEWINDOWACCESS_HXX
Index: source/ui/querydesign/TableWindow.cxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/ui/querydesign/TableWindow.cxx,v
retrieving revision 1.38
diff -u -r1.38 TableWindow.cxx
--- openoffice.org.orig/dbaccess/source/ui/querydesign/TableWindow.cxx	21 Nov 2007 17:11:47 -0000	1.38
+++ openoffice.org/dbaccess/source/ui/querydesign/TableWindow.cxx	30 Jul 2008 14:05:20 -0000
@@ -171,13 +173,18 @@
 {
 	DBG_DTOR(OTableWindow,NULL);
 
 	if (m_pListBox)
 	{
 		OSL_ENSURE(m_pListBox->GetEntryCount()==0,"Forgot to call EmptyListbox()!");
 		::std::auto_ptr<Window> aTemp(m_pListBox);
 		m_pListBox = NULL;
 	}
-	m_pAccessible = NULL;
+	if ( m_pAccessible )
+	{
+		m_pAccessible->clearTable();
+		m_pAccessible = NULL;
+	}
+
 }
 // -----------------------------------------------------------------------------
 const OJoinTableView* OTableWindow::getTableView() const
Index: source/ui/querydesign/TableWindowAccess.cxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/ui/querydesign/TableWindowAccess.cxx,v
retrieving revision 1.12
diff -u -r1.12 TableWindowAccess.cxx
--- openoffice.org.orig/dbaccess/source/ui/querydesign/TableWindowAccess.cxx	27 Jun 2007 12:25:46 -0000	1.12
+++ openoffice.org/dbaccess/source/ui/querydesign/TableWindowAccess.cxx	30 Jul 2008 14:05:20 -0000
@@ -96,6 +96,11 @@
 		m_pTable = NULL;
 		VCLXAccessibleComponent::disposing();
 	}
+        void OTableWindowAccess::clearTable()
+	{
+        	::osl::MutexGuard aGuard( m_aMutex );
+        	m_pTable = NULL;
+	}
 	// -----------------------------------------------------------------------------
 	Any SAL_CALL OTableWindowAccess::queryInterface( const Type& aType ) throw (RuntimeException)
 	{
Index: source/extended/accessiblelistbox.cxx
===================================================================
RCS file: /cvs/gsl/accessibility/source/extended/accessiblelistbox.cxx,v
retrieving revision 1.2.28.1
diff -u -r1.2.28.1 accessiblelistbox.cxx
--- openoffice.org.orig/accessibility/source/extended/accessiblelistbox.cxx	17 Jan 2008 15:39:08 -0000	1.2.28.1
+++ openoffice.org/accessibility/source/extended/accessiblelistbox.cxx	30 Jul 2008 14:03:22 -0000
@@ -305,7 +305,10 @@
 		::comphelper::OExternalLockGuard aGuard( this );
 
 		ensureAlive();
-		return getListBox()->GetAccessibleName();
+		::rtl::OUString sRet;
+		if (getListBox())
+			sRet = getListBox()->GetAccessibleName();
+		return sRet;
 	}
 	// -----------------------------------------------------------------------------
 	// XAccessibleSelection


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1596
retrieving revision 1.1597
diff -u -r1.1596 -r1.1597
--- openoffice.org.spec	28 Jul 2008 21:37:54 -0000	1.1596
+++ openoffice.org.spec	30 Jul 2008 14:15:23 -0000	1.1597
@@ -107,6 +107,7 @@
 Patch36: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
 Patch37: openoffice.org-3.0.0.ooo91977.sd.holdreference.patch
 Patch38: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
+Patch39: openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1259,6 +1260,7 @@
 %patch36 -p1 -b .ooo86142.serbiannumbering.patch
 %patch37 -p1 -b .ooo91977.sd.holdreference.patch
 %patch38 -p1 -b .ooo92026.sd.disposed_during_disposing.patch
+%patch39 -p1 -b .ooo92253.dbaccess.a11y.crash
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3565,6 +3567,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Wed Jul 30 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.28-2
+- Resolves: rhbz#457193 openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash
+
 * Mon Jul 28 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.28-1
 - next version
 - drop (finally!) integrated ooo#64726 bengali translation fix (April 2006)