The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 4aa1497aad610005a7bd8ae056fce8118627a6af
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Tue Jan 8 20:53:44 2013 +0100
lp#1097437: Do not move nCurUndoAction < 0
diff --git a/changelog b/changelog
index a5888a3..ac004c9 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,7 @@ libreoffice (1:3.5.7-0ubuntu3) UNRELEASED; urgency=low
* backport GetSdrPageView() might return NULL (LP: #1097393)
* backport Writer crashed while editing a table (LP: #1097406)
* backport Objects anchored to cell wrongly positionned to A1 (LP: #1097433)
+ * backport Do not move nCurUndoAction < 0 (LP: #1097437)
-- Bjoern Michaelsen <bjoern.michael...@canonical.com> Tue, 08 Jan 2013
17:09:36 +0100
diff --git a/patches/lp-1097437-Do-not-move-nCurUndoAction-0.diff
b/patches/lp-1097437-Do-not-move-nCurUndoAction-0.diff
new file mode 100644
index 0000000..f65bc41
--- /dev/null
+++ b/patches/lp-1097437-Do-not-move-nCurUndoAction-0.diff
@@ -0,0 +1,31 @@
+From b23f8e66c30281e3a85907ad0ec2cf80387bf90f Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sberg...@redhat.com>
+Date: Fri, 27 Jan 2012 14:58:19 +0100
+Subject: [PATCH] Do not move nCurUndoAction < 0.
+
+(Could easily happen when max undo steps is set to 1.)
+
+Signed-off-by: Michael Meeks <michael.me...@suse.com>
+---
+ svl/source/undo/undo.cxx | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
+index e3b8cd1..e61d695 100644
+--- a/svl/source/undo/undo.cxx
++++ b/svl/source/undo/undo.cxx
+@@ -658,7 +658,10 @@ bool SfxUndoManager::ImplAddUndoAction_NoNotify(
SfxUndoAction *pAction, bool bT
+ {
+ i_guard.markForDeletion(
m_pData->pActUndoArray->aUndoActions[0].pAction );
+ m_pData->pActUndoArray->aUndoActions.Remove(0);
+- --m_pData->pActUndoArray->nCurUndoAction;
++ if (m_pData->pActUndoArray->nCurUndoAction > 0)
++ {
++ --m_pData->pActUndoArray->nCurUndoAction;
++ }
+ }
+ }
+
+--
+1.7.10.4
+
diff --git a/patches/series b/patches/series
index a947051..e3ed8be 100644
--- a/patches/series
+++ b/patches/series
@@ -41,3 +41,4 @@ lp-1097370-rhbz-855541-XIOError-handler-multithread-wo.diff
lp-1097393-rhbz-855972-crash-on-switching-to-outline-v.diff
lp-1097406-rhbz-852128-sw-avoid-table-undo-crash.diff
lp-1097433-fdo-56009-fdo-54695-Calculate-positions-of-.diff
+lp-1097437-Do-not-move-nCurUndoAction-0.diff
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ttcmj-0003yq...@vasks.debian.org
