[libreoffice/f17] Resolves: rhbz#846775 Clipboard must be disposed before Selection

[Caolán McNamara]

commit 1e358ec8b1b78dfe690dcc8f10f527115f800df4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Aug 22 12:18:04 2012 +0100

    Resolves: rhbz#846775 Clipboard must be disposed before Selection

 ...bz-846775-Clipboard-must-be-disposed-befo.patch |   66 ++++++++++++++++++++
 libreoffice.spec                                   |    7 ++-
 2 files changed, 72 insertions(+), 1 deletions(-)
---
diff --git a/0001-Resolves-rhbz-846775-Clipboard-must-be-disposed-befo.patch b/0001-Resolves-rhbz-846775-Clipboard-must-be-disposed-befo.patch
new file mode 100644
index 0000000..5cdb4be
--- /dev/null
+++ b/0001-Resolves-rhbz-846775-Clipboard-must-be-disposed-befo.patch
@@ -0,0 +1,66 @@
+From e99813f9372d24d3d2d734573c582d3e257cb5cc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Wed, 22 Aug 2012 11:46:50 +0100
+Subject: [PATCH] Resolves: rhbz#846775 Clipboard must be disposed before
+ Selection
+
+Change-Id: I968bc6da85cd444d504b08f85300a1fe251cdeee
+---
+ sd/source/ui/slidesorter/controller/SlideSorterController.cxx     | 5 +++--
+ sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx | 2 +-
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+index 10ca623..ae9a6e9 100644
+--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
++++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+@@ -110,10 +110,10 @@ SlideSorterController::SlideSorterController (SlideSorter& rSlideSorter)
+       mpPageSelector(),
+       mpFocusManager(),
+       mpSlotManager(),
+-      mpClipboard(),
+       mpScrollBarManager(),
+       mpCurrentSlideManager(),
+       mpSelectionManager(),
++      mpClipboard(),
+       mpInsertionIndicatorHandler(new InsertionIndicatorHandler(rSlideSorter)),
+       mpAnimator(new Animator(rSlideSorter)),
+       mpVisibleAreaManager(new VisibleAreaManager(rSlideSorter)),
+@@ -156,9 +156,9 @@ void SlideSorterController::Init (void)
+     mpPageSelector.reset(new PageSelector(mrSlideSorter));
+     mpFocusManager.reset(new FocusManager(mrSlideSorter));
+     mpSlotManager.reset(new SlotManager(mrSlideSorter));
+-    mpClipboard.reset(new Clipboard(mrSlideSorter));
+     mpScrollBarManager.reset(new ScrollBarManager(mrSlideSorter));
+     mpSelectionManager.reset(new SelectionManager(mrSlideSorter));
++    mpClipboard.reset(new Clipboard(mrSlideSorter));
+ 
+     mpScrollBarManager->LateInitialization();
+ 
+@@ -202,6 +202,7 @@ SlideSorterController::~SlideSorterController (void)
+ void SlideSorterController::Dispose (void)
+ {
+     mpInsertionIndicatorHandler->End(Animator::AM_Immediate);
++    mpClipboard.reset();
+     mpSelectionManager.reset();
+     mpAnimator->Dispose();
+ }
+diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+index f456cb4..bf3d844 100644
+--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
++++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+@@ -243,10 +243,10 @@ private:
+     ::boost::scoped_ptr<PageSelector> mpPageSelector;
+     ::boost::scoped_ptr<FocusManager> mpFocusManager;
+     ::boost::shared_ptr<SlotManager> mpSlotManager;
+-    ::boost::scoped_ptr<controller::Clipboard> mpClipboard;
+     ::boost::scoped_ptr<ScrollBarManager> mpScrollBarManager;
+     mutable ::boost::shared_ptr<CurrentSlideManager> mpCurrentSlideManager;
+     ::boost::shared_ptr<SelectionManager> mpSelectionManager;
++    ::boost::scoped_ptr<controller::Clipboard> mpClipboard;
+     ::boost::shared_ptr<InsertionIndicatorHandler> mpInsertionIndicatorHandler;
+     ::boost::shared_ptr<Animator> mpAnimator;
+     ::boost::scoped_ptr<VisibleAreaManager> mpVisibleAreaManager;
+-- 
+1.7.11.2
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 71cc3b4..eb77f27 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:        1%{?dist}
+Release:        2%{?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
@@ -149,6 +149,7 @@ Patch31: 0001-Resolves-fdo-49849-implement-Unicode-6.1-hebrew-line.patch
 Patch32: 0001-use-ure-instead-of-ure-link.patch
 Patch33: 0001-Resolves-rhbz-838368-view-ignored-while-view-accepte.patch
 Patch34: 0001-Resolves-rhbz-836937-insanely-slow-with-Zemberek-ins.patch
+Patch35: 0001-Resolves-rhbz-846775-Clipboard-must-be-disposed-befo.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1013,6 +1014,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch32 -p1 -b .use-ure-instead-of-ure-link.patch
 %patch33 -p1 -b .rhbz-838368-view-ignored-while-view-accepte.patch
 %patch34 -p1 -b .rhbz-836937-insanely-slow-with-Zemberek-ins.patch
+%patch35 -p1 -b .rhbz-846775-Clipboard-must-be-disposed-befo.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2299,6 +2301,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Wed Aug 22 2012 Caolán McNamara <caolanm at redhat.com> - 1:3.5.6.2-2
+- Resolves: rhbz#846775 Clipboard must be disposed before Selection
+
 * Wed Aug 08 2012 David Tardon <dtardon at redhat.com> - 1:3.5.6.2-1
 - 3.5.6 rc2
 - drop integrated 0001-resolved-rhbz-838248-init-filter-criteria-string.patch