[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - svl/source

[Michael Stahl]

 svl/source/undo/undo.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 651f3bfa7bc843e778c851e6cafc32e401c3890d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Aug 12 23:48:45 2013 +0200

    fdo#66071: SfxUndoManager: allow Writer to set modified status properly
    
    If Undo actions are removed due to max undo limit, invalidate the
    current empty mark so it is different from sw::UndoManager::m_UndoSaveMark.
    
    Change-Id: I20415f42a77b67e9935c75b12df675ba1c5ef5ec
    (cherry picked from commit 1ff7dfa533b473d721c372ae801a46ecd513b32f)
    Reviewed-on: https://gerrit.libreoffice.org/5380
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index 379a327..5862acc 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -648,6 +648,8 @@ bool SfxUndoManager::ImplAddUndoAction_NoNotify( SfxUndoAction *pAction, bool bT
             {
                 --m_pData->pActUndoArray->nCurUndoAction;
             }
+            // fdo#66071 invalidate the current empty mark when removing
+            --m_pData->mnEmptyMark;
         }
     }