[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.2_rc2-1-164-g10e447e

["Bjoern Michaelsen" <bjoern.michaelsen@canonical.com>]

The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 6a80858caae0c1d85675636cddaf4d378f963bbf
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Wed Jan 9 14:10:43 2013 +0100

    lp#1097727: Clipboard must be disposed before Selection

diff --git a/changelog b/changelog
index a61fa5b..41f2a6f 100644
--- a/changelog
+++ b/changelog
@@ -11,6 +11,7 @@ libreoffice (1:3.5.7-0ubuntu3) UNRELEASED; urgency=low
   * backport Enable NPP_Initialize/Shutdown again (LP: #1097715) 
   * backport torn off popups trigger keyboard focus problems (LP: #1097718) 
   * backport a11y: call doShow after we have a valid view (LP: #1097722)
+  * backport Clipboard must be disposed before Selection (LP: #1097727) 
 
  -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Tue, 08 Jan 2013 17:09:36 +0100
 
diff --git a/patches/lp-1097727-rhbz-846775-Clipboard-must-be-disposed-befo.diff b/patches/lp-1097727-rhbz-846775-Clipboard-must-be-disposed-befo.diff
new file mode 100644
index 0000000..d2cf0d8
--- /dev/null
+++ b/patches/lp-1097727-rhbz-846775-Clipboard-must-be-disposed-befo.diff
@@ -0,0 +1,66 @@
+From f1aaa99268a715e2b23e081968c1dd19087fe169 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Wed, 22 Aug 2012 11:46:50 +0100
+Subject: [PATCH 05/14] 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 0d9f576..a9a1cb4 100644
+--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
++++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+@@ -112,10 +112,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)),
+@@ -158,9 +158,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();
+ 
+@@ -205,6 +205,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 e962623..c515480 100644
+--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
++++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+@@ -245,10 +245,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.10.4
+
diff --git a/patches/series b/patches/series
index 1b8431d..4b71abb 100644
--- a/patches/series
+++ b/patches/series
@@ -46,3 +46,4 @@ lp-1097710-Do-not-check-the-stored-DIFAT-sector-count.diff
 lp-1097715-Enable-NPP_Initialize-Shutdown-again.diff
 lp-1097718-fdo-48096-possibly-also-lp-26303-lp-399765-.diff
 lp-1097722-Resolves-rhbz-805743-a11y-call-doShow-after-we-have-.diff
+lp-1097727-rhbz-846775-Clipboard-must-be-disposed-befo.diff

-- 
LibreOffice packaging repository