[openoffice.org/f14/master] Resolves: rhbz#624908/ooo#114012 bad a11y chain in draw

[Caolan McNamara]

commit c1b1a1222c82fff0dbf25322554afc3776b00dfb
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 24 15:53:43 2010 +0100

    Resolves: rhbz#624908/ooo#114012 bad a11y chain in draw

 ...ffice.org-3.3.0.ooo114012.sd.bada11ychain.patch |   46 ++++++--------------
 openoffice.org.spec                                |    5 ++-
 2 files changed, 18 insertions(+), 33 deletions(-)
---
diff --git a/openoffice.org-3.3.0.ooo114012.sd.bada11ychain.patch b/openoffice.org-3.3.0.ooo114012.sd.bada11ychain.patch
index fc0fd89..e079399 100644
--- a/openoffice.org-3.3.0.ooo114012.sd.bada11ychain.patch
+++ b/openoffice.org-3.3.0.ooo114012.sd.bada11ychain.patch
@@ -1,40 +1,22 @@
 --- sd/source/ui/accessibility/AccessibleSlideSorterView.cxx	2010-08-20 10:29:47.000000000 +0100
 +++ sd/source/ui/accessibility/AccessibleSlideSorterView.cxx	2010-08-20 10:45:27.000000000 +0100
-@@ -70,6 +72,7 @@
-         AccessibleSlideSorterView& rAccessibleSlideSorter,
-         ::sd::slidesorter::SlideSorter& rSlideSorter,
-         ::Window* pWindow);
-+    void InitialConnectAndUpdate (void);
-     ~Implementation (void);
- 
-     void UpdateChildren (void);
-@@ -116,6 +119,7 @@
+@@ -109,13 +109,18 @@
+     const Reference<XAccessible>& rxParent,
+     ::Window* pContentWindow)
+     : AccessibleSlideSorterViewBase(MutexOwner::maMutex),
+-      mpImpl(new Implementation(*this,rSlideSorter,pContentWindow)),
+       mrSlideSorter(rSlideSorter),
+       mxParent(rxParent),
+       mnClientId(0),
        mpContentWindow(pContentWindow)
  {
  	OSL_TRACE("creating AccessibleSlideSorterView");
-+    mpImpl->InitialConnectAndUpdate();
++    //self-acquire for the duration of the ctor to avoid
++    //that the Implementation ctor ends up disposing us
++    //before we've even finished ctor
++    acquire();
++    mpImpl.reset(new Implementation(*this,rSlideSorter,pContentWindow));
++    release();
  }
  
  
-@@ -787,6 +791,13 @@
-       mnFocusedIndex(-1),
-       mbModelChangeLocked(false)
- {
-+}
-+
-+
-+
-+
-+void AccessibleSlideSorterView::Implementation::InitialConnectAndUpdate (void)
-+{
-     ConnectListeners();
-     UpdateChildren();
- }
-@@ -794,6 +805,7 @@
- 
- 
- 
-+
- AccessibleSlideSorterView::Implementation::~Implementation (void)
- {
-     ReleaseListeners();
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 496e5d1..c75e3af 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
 %define ooomilestone 5
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -3823,6 +3823,9 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
+* Tue Aug 24 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-5.2
+- Resolves: rhbz#624908/ooo#114012 bad a11y chain in draw
+
 * Fri Aug 20 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-5.1
 - next milestone