[Libreoffice-commits] core.git: 2 commits - cppunit/unxlngx6 svl/source

[Michael Stahl]

 dev/null                 |binary
 svl/source/undo/undo.cxx |    2 ++
 2 files changed, 2 insertions(+)

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

    remove the accidentally committed cppunit/unxlngx6/bin/DllPlugInTester
    
    Change-Id: Id14c4f46e29e53cbd60f33cf75645f386a7cc81b

diff --git a/cppunit/unxlngx6/bin/DllPlugInTester b/cppunit/unxlngx6/bin/DllPlugInTester
deleted file mode 100755
index e6446f3..0000000
Binary files a/cppunit/unxlngx6/bin/DllPlugInTester and /dev/null differ
commit 1ff7dfa533b473d721c372ae801a46ecd513b32f
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

diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index 4ed216e..867f72d 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -600,6 +600,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;
         }
     }