rpms/openoffice.org/devel workspace.dba301a.patch, NONE, 1.1 openoffice.org.spec, 1.1616, 1.1617 openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash, 1.2, NONE

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.dba301a.patch 
Removed Files:
	openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash 
Log Message:
update to upstream dbaccess a11y solution

workspace.dba301a.patch:

--- NEW FILE workspace.dba301a.patch ---
Index: dba/dbaccess/source/ui/inc/TableWindowAccess.hxx
diff -u dba/dbaccess/source/ui/inc/TableWindowAccess.hxx:1.7 dba/dbaccess/source/ui/inc/TableWindowAccess.hxx:1.7.74.1
--- dba/dbaccess/source/ui/inc/TableWindowAccess.hxx:1.7	Thu Apr 10 08:19:39 2008
+++ dba/dbaccess/source/ui/inc/TableWindowAccess.hxx	Tue Aug 12 00:21:30 2008
@@ -64,6 +64,8 @@
 			@return	true if it is editable otherwise false				
 		*/
 		virtual sal_Bool isEditable() const;
+
+        virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
 	public:
 		OTableWindowAccess(	OTableWindow* _pTable);
 
Index: dba/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
diff -u dba/dbaccess/source/ui/querydesign/TableWindowAccess.cxx:1.14 dba/dbaccess/source/ui/querydesign/TableWindowAccess.cxx:1.14.34.1
--- dba/dbaccess/source/ui/querydesign/TableWindowAccess.cxx:1.14	Wed Jun 25 05:54:35 2008
+++ dba/dbaccess/source/ui/querydesign/TableWindowAccess.cxx	Tue Aug 12 00:21:52 2008
@@ -86,11 +86,19 @@
 	{
 	}
 	// -----------------------------------------------------------------------------
-	void SAL_CALL OTableWindowAccess::disposing()
+    void SAL_CALL OTableWindowAccess::disposing()
 	{
 		m_pTable = NULL;
 		VCLXAccessibleComponent::disposing();
 	}
+    // -----------------------------------------------------------------------------
+    void OTableWindowAccess::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
+	{
+        if ( rVclWindowEvent.GetId() == VCLEVENT_OBJECT_DYING )
+            m_pTable = NULL;
+
+        VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
+	}
 	// -----------------------------------------------------------------------------
 	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.1616
retrieving revision 1.1617
diff -u -r1.1616 -r1.1617
--- openoffice.org.spec	12 Aug 2008 07:23:39 -0000	1.1616
+++ openoffice.org.spec	12 Aug 2008 08:04:39 -0000	1.1617
@@ -106,7 +106,7 @@
 Patch34: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
 Patch35: openoffice.org-3.0.0.ooo91977.sd.holdreference.patch
 Patch36: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
-Patch37: openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash
+Patch37: workspace.dba301a.patch
 Patch38: openoffice.org-3.0.0.oooXXXXX.helpcontent2.fixlucene.patch
 Patch39: openoffice.org-3.0.0.ooo92522.sd.brokentemplates.patch
 Patch40: openoffice.org-3.0.0.ooo91904.sd.wrongindex.patch
@@ -1273,7 +1273,7 @@
 %patch34 -p1 -b .ooo86142.serbiannumbering.patch
 %patch35 -p1 -b .ooo91977.sd.holdreference.patch
 %patch36 -p1 -b .ooo92026.sd.disposed_during_disposing.patch
-%patch37 -p1 -b .ooo92253.dbaccess.a11y.crash
+%patch37 -p1 -b .workspace.dba301a.patch
 %patch38 -p1 -b .oooXXXXX.helpcontent2.fixlucene.patch
 %patch39 -p1 -b .ooo92522.sd.brokentemplates.patch
 %patch40 -p1 -b .ooo91904.sd.wrongindex.patch
@@ -3604,6 +3604,7 @@
 * Mon Aug 11 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-2.2
 - Resolves: rhbz#458681 python requires
 - Resolves: rhbz#458739 icon generation sequence
+- update to upstream dbaccess a11y solution
 
 * Sat Aug 09 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-2.1
 - next milestone


--- openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash DELETED ---