[libreoffice] Resolves: rhbz#805743 a11y crash in impress/draw

[Caolán McNamara]

commit 99cca49bebd470175847501e4942b4afcde6a29a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed May 9 12:50:31 2012 +0100

    Resolves: rhbz#805743 a11y crash in impress/draw

 ...bz-805743-a11y-call-doShow-after-we-have-.patch |   91 ++++++++++++++++++++
 libreoffice.spec                                   |    7 ++-
 2 files changed, 97 insertions(+), 1 deletions(-)
---
diff --git a/0001-Resolves-rhbz-805743-a11y-call-doShow-after-we-have-.patch b/0001-Resolves-rhbz-805743-a11y-call-doShow-after-we-have-.patch
new file mode 100644
index 0000000..cb5817a
--- /dev/null
+++ b/0001-Resolves-rhbz-805743-a11y-call-doShow-after-we-have-.patch
@@ -0,0 +1,91 @@
+From 4ae4c57caab02c5d8fe91cd9956fabba6bd3dc1e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Wed, 9 May 2012 12:39:28 +0100
+Subject: [PATCH] Resolves: rhbz#805743 a11y: call doShow after we have a
+ valid view
+
+Basically a regression from ec240eafe9b25620383aa54015f5c55e0f64227a but things
+were broken before that too.
+
+enable a11y (for gnome 3 this is gsettings set org.gnome.desktop.interface
+toolkit-accessibility true), and run the smoketest with dbg-util before
+touching this stuff
+
+Change-Id: I I55f4e22d8ac61c7ac3ccc37b82794604b28a8f14
+---
+ .../ui/slidesorter/shell/SlideSorterViewShell.cxx  |    2 +-
+ sd/source/ui/toolpanel/ToolPanelViewShell.cxx      |    2 +-
+ sd/source/ui/view/drviewsa.cxx                     |    3 +--
+ sd/source/ui/view/outlnvsh.cxx                     |    4 ++--
+ 4 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+index a9b09a9..7b874c0 100644
+--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
++++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+@@ -186,7 +186,7 @@ void SlideSorterViewShell::Initialize (void)
+         mpScrollBarBox);
+     mpView = &mpSlideSorter->GetView();
+ 
+-    ViewShell::doShow();
++    doShow();
+ 
+     SetPool( &GetDoc()->GetPool() );
+     SetUndoManager( GetDoc()->GetDocSh()->GetUndoManager() );
+diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
+index 12f6515..8eb9bc7 100644
+--- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
++++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
+@@ -482,7 +482,7 @@ ToolPanelViewShell::ToolPanelViewShell( SfxViewFrame* pFrame, ViewShellBase& rVi
+     ,mpSubShellManager()
+     ,mnMenuId(0)
+ {
+-    ViewShell::doShow();
++    doShow();
+ 
+     meShellType = ST_TASK_PANE;
+ 
+diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
+index 0d1b5ac..1dabda6 100644
+--- a/sd/source/ui/view/drviewsa.cxx
++++ b/sd/source/ui/view/drviewsa.cxx
+@@ -137,13 +137,12 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBas
+ , mbIsLayerModeActive(false)
+ , mbIsInSwitchPage(false)
+ {
+-    ViewShell::doShow();
+-
+     if (pFrameViewArgument != NULL)
+         mpFrameView = pFrameViewArgument;
+     else
+         mpFrameView = new FrameView(GetDoc());
+     Construct(GetDocSh(), ePageKind);
++    doShow();
+ }
+ 
+ /*************************************************************************
+diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
+index 4f13989..f37b7a0 100644
+--- a/sd/source/ui/view/outlnvsh.cxx
++++ b/sd/source/ui/view/outlnvsh.cxx
+@@ -222,8 +222,6 @@ OutlineViewShell::OutlineViewShell (
+       mbInitialized(false)
+ 
+ {
+-    ViewShell::doShow();
+-
+     if (pFrameViewArgument != NULL)
+         mpFrameView = pFrameViewArgument;
+     else
+@@ -232,6 +230,8 @@ OutlineViewShell::OutlineViewShell (
+     mpFrameView->Connect();
+ 
+     Construct(GetDocSh());
++
++    doShow();
+ }
+ 
+ /*************************************************************************
+-- 
+1.7.7.6
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 7d55b9c..d661c66 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -35,7 +35,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -144,6 +144,7 @@ Patch30: 0001-fdo-38088-better-CSV-import-default-separators.patch
 Patch31: 0001-save-register-arguments-first.patch
 Patch32: 0001-do-not-let-gcc-use-registers-we-are-setting-ourselve.patch
 Patch33: 0001-wrong-types-used-here-breaks-64bit-bigendian.patch
+Patch34: 0001-Resolves-rhbz-805743-a11y-call-doShow-after-we-have-.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -999,6 +1000,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch31 -p1 -b .save-register-arguments-first.patch
 %patch32 -p1 -b .do-not-let-gcc-use-registers-we-are-setting-ourselve.patch
 %patch33 -p1 -b .wrong-types-used-here-breaks-64bit-bigendian.patch
+%patch34 -p1 -b .rhbz-805743-a11y-call-doShow-after-we-have-.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2286,6 +2288,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Wed May 09 2012 Caolán McNamara <caolanm at redhat.com> - 3.5.3.2-3
+- Resolves: rhbz#805743 a11y crash in impress/draw
+
 * Thu May 03 2012 David Tardon <dtardon at redhat.com> - 3.5.3.2-2
 - rebuild for changed dependencies