rpms/openoffice.org/FC-5 openoffice.org-2.0.2.ooo63583.sd.accessibility.patch, NONE, 1.1 openoffice.org.spec, 1.646, 1.647

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15049

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.2.ooo63583.sd.accessibility.patch 
Log Message:
accessibility fixes

openoffice.org-2.0.2.ooo63583.sd.accessibility.patch:
 sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx |    2 +
 sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx   |   19 +++++++++++---
 source/ui/accessibility/AccessibleDrawDocumentView.cxx    |    0 
 source/ui/slidesorter/shell/SlideSorterViewShell.cxx      |    0 
 4 files changed, 17 insertions(+), 4 deletions(-)

--- NEW FILE openoffice.org-2.0.2.ooo63583.sd.accessibility.patch ---
Index: source/ui/slidesorter/shell/SlideSorterViewShell.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx,v
retrieving revision 1.20
diff -u -r1.20 SlideSorterViewShell.cxx
--- openoffice.org.orig/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx	19 Jan 2006 12:53:55 -0000	1.20
+++ openoffice.org/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx	24 Mar 2006 14:28:02 -0000
@@ -274,10 +274,21 @@
     ::com::sun::star::accessibility::XAccessible>
     SlideSorterViewShell::CreateAccessibleDocumentView (::sd::Window* pWindow)
 {
-    return new ::accessibility::AccessibleSlideSorterView (
-        *mpSlideSorterController.get(),
-        pWindow->GetAccessibleParentWindow()->GetAccessible(),
-        pWindow);
+    ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible> xAccessible;
+
+    DBG_ASSERT (mpSlideSorterController.get()!=NULL,
+	"no controller when SlideSorterViewShell::CreateAccessibleDocumentView called");
+
+    if (mpSlideSorterController.get() != NULL)
+    {
+        xAccessible = new ::accessibility::AccessibleSlideSorterView (
+            *mpSlideSorterController.get(),
+            pWindow->GetAccessibleParentWindow()->GetAccessible(),
+            pWindow);
+    }
+
+    return xAccessible;
 }
 
 
Index: source/ui/accessibility/AccessibleDrawDocumentView.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx,v
retrieving revision 1.24
diff -u -r1.24 AccessibleDrawDocumentView.cxx
--- openoffice.org.orig/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx	9 Sep 2005 03:26:12 -0000	1.24
+++ openoffice.org/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx	24 Mar 2006 14:29:44 -0000
@@ -701,6 +701,8 @@
     // Release resources.
     if (mpChildrenManager != NULL)
     {
+        maShapeTreeInfo.SetSdrView(NULL);
+        mpChildrenManager->SetInfo (maShapeTreeInfo);
         delete mpChildrenManager;
         mpChildrenManager = NULL;
     }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.646
retrieving revision 1.647
diff -u -r1.646 -r1.647
--- openoffice.org.spec	22 Mar 2006 11:40:38 -0000	1.646
+++ openoffice.org.spec	24 Mar 2006 14:52:39 -0000	1.647
@@ -159,6 +159,7 @@
 Patch34: openoffice.org-2.0.2.ooo62030.solenv._version.patch
 Patch35: openoffice.org-2.0.2.oooXXXXX.config_office.noppds.patch
 Patch36: openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch
+Patch37: openoffice.org-2.0.2.ooo63583.sd.accessibility.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -804,6 +805,7 @@
 %patch34 -p1 -b .ooo62030.solenv._version.patch
 %patch35 -p1 -b .oooXXXXX.config_office.noppds.patch
 %patch36 -p1 -b .ooo63155.sfx2.badscript.patch
+%patch37 -p1 -b .ooo63583.sd.accessibility.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -1097,6 +1099,9 @@
 echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/writer.desktop
 echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop
 echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop
+# rh#156677# / rh#186515#
+echo "NoDisplay=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop
+echo "NoDisplay=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop
 chmod u-w $RPM_BUILD_ROOT/%{instdir}/share/xdg/*.desktop
 
 #relocate the .desktop and icon files
@@ -1105,6 +1110,8 @@
 mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/calc.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-calc.desktop
 mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/impress.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-impress.desktop
 mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/writer.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-writer.desktop
+mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-math.desktop
+mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-draw.desktop
 rm -rf $RPM_BUILD_ROOT/%{instdir}/share/xdg
 cp -r sysui/unxlng*/misc/redhat/usr/share/icons $RPM_BUILD_ROOT/%{_datadir}
 cp -r sysui/unxlng*/misc/redhat/usr/share/mime-info $RPM_BUILD_ROOT/%{_datadir}
@@ -2945,6 +2952,7 @@
 %dir %{instdir}/share/registry/schema/org/openoffice/Office/UI
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs
 %dir %{_datadir}/applications
+%{_datadir}/applications/openoffice.org-*-draw.desktop
 %dir %{_datadir}/mimelnk
 %dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/*drawing*
@@ -3131,6 +3139,7 @@
 %dir %{instdir}/share/registry/schema/org/openoffice/Office/UI
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/MathCommands.xcs
 %dir %{_datadir}/applications
+%{_datadir}/applications/openoffice.org-*-math.desktop
 %dir %{_datadir}/mimelnk
 %dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/*formula*
@@ -3242,6 +3251,8 @@
 - drop integrated openoffice.org-1.9.114.ooo51718.rpath.patch
 - add openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch for rh#185390#
 - accessibility detection missing
+- rh#186515# Keep draw and math launchers for mimetypes
+- rh#186215#/ooo#63583# accessibility crashed in impress
 
 * Fri Mar 10 2006 Bill Nottingham <notting at redhat.com> - 1:2.0.2-5.2
 - rebuild for PPC TLS issue (#184446)