[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.5.4-5-167-g797d8ff
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 576f40c827638e002752fee256c1f67b7b493007
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Aug 8 09:43:11 2012 +0200
add workaround for fdo#51324
diff --git a/changelog b/changelog
index e4dddb3..ef67ebe 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:3.6.0~rc4-0ubuntu2) precise; urgency=low
+
+ * backport patch to evade fdo#51324 (LP: #1017125)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 08 Aug 2012 09:40:58 +0200
+
libreoffice (1:3.6.0~rc4-0ubuntu1) quantal-proposed; urgency=low
* update to upstream rc4
diff --git a/patches/fdo-51324-lp-1017125-rhbz-806236-rhbz-823272-erase-o.diff b/patches/fdo-51324-lp-1017125-rhbz-806236-rhbz-823272-erase-o.diff
new file mode 100644
index 0000000..ed64425
--- /dev/null
+++ b/patches/fdo-51324-lp-1017125-rhbz-806236-rhbz-823272-erase-o.diff
@@ -0,0 +1,33 @@
+From a0ff39aef11e6e390f01b395c0f7063f6179b98e Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Tue, 7 Aug 2012 11:36:47 +0200
+Subject: [PATCH] fdo#51324 lp#1017125 rhbz#806236 rhbz#823272: erase on
+ invalid iterators
+
+* the iterators returned by equal_range are invalidated by modification
+ (which deleting them clearly is)
+* possibly only a partial fix as there is more abuse of equal_range in that
+ file
+
+Change-Id: Ie9ba01e91cb449a32d77a69590bda2125f0924e1
+---
+ sd/source/ui/toolpanel/TaskPaneFocusManager.cxx | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
+index 6be7076..4f9698a 100644
+--- a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
++++ b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
+@@ -226,8 +226,7 @@ void FocusManager::RemoveLinks (::Window* pWindow)
+ pWindow->RemoveEventListener (LINK (this, FocusManager, WindowEventListener));
+
+ // Remove the links from the given window.
+- ::std::pair<LinkMap::iterator,LinkMap::iterator> aCandidates(mpLinks->equal_range(pWindow));
+- mpLinks->erase(aCandidates.first, aCandidates.second);
++ mpLinks->erase(pWindow);
+
+ // Remove links to the given window.
+ bool bLinkRemoved;
+--
+1.7.9.5
+
diff --git a/patches/series b/patches/series
index ae2f656..ca207b0 100644
--- a/patches/series
+++ b/patches/series
@@ -29,3 +29,4 @@ disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
trying-to-force-CXX0X-off-for-ABI-incompatibility.diff
lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
remove-broken-mysqlcon-version-check.diff
+fdo-51324-lp-1017125-rhbz-806236-rhbz-823272-erase-o.diff
--
LibreOffice packaging repository
Reply to: