rpms/openoffice.org/F-9 openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash, NONE, 1.1 openoffice.org.spec, 1.1501, 1.1502

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19727

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/F-9/openoffice.org.spec,v
retrieving revision 1.1501
retrieving revision 1.1502
diff -u -r1.1501 -r1.1502
--- openoffice.org.spec	23 Jul 2008 09:52:59 -0000	1.1501
+++ openoffice.org.spec	30 Jul 2008 14:16:59 -0000	1.1502
@@ -166,6 +166,7 @@
 Patch91: workspace.locdat30.patch
 Patch92: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
 Patch93: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
+Patch94: openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1146,6 +1147,7 @@
 %patch91 -p1 -b .workspace.locdat30.patch
 %patch92 -p1 -b .ooo86142.serbiannumbering.patch
 %patch93 -p1 -b .ooo92026.sd.disposed_during_disposing.patch
+%patch94 -p1 -b .ooo92253.dbaccess.a11y.crash
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2948,6 +2950,7 @@
 - Resolves: rhbz#452374 add openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
 - Resolves: rhbz#452385 add postgress-jdbc to default classpath
 - Resolves: rhbz#456292 openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
+- Resolves: rhbz#457193 openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash
 
 * Fri Jun 13 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.1-17.4
 - Resolves: rhbz#451485 fix vertical glyphs