rpms/openoffice.org/devel openoffice.org-2.0.2.ooo63583.sd.accessibility.patch, NONE, 1.1 openoffice.org.spec, 1.652, 1.653
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Mar 24 14:53:23 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15077
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/devel/openoffice.org.spec,v
retrieving revision 1.652
retrieving revision 1.653
diff -u -r1.652 -r1.653
--- openoffice.org.spec 24 Mar 2006 09:28:14 -0000 1.652
+++ openoffice.org.spec 24 Mar 2006 14:53:21 -0000 1.653
@@ -177,6 +177,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
@@ -823,6 +824,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
@@ -3268,6 +3270,7 @@
%changelog
* Fri Mar 24 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.4.cmc
- rh#186515# Keep draw and math launchers for mimetypes
+- rh#186215#/ooo#63583# accessibility crashed in impress
* Mon Mar 13 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.4
- ooo#59997# replacement opens___.ttf updated
More information about the fedora-cvs-commits
mailing list