[Libreoffice-commits] .: sc/source

[Eike Rathke]

 sc/source/core/tool/chgtrack.cxx |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit c1db721af6286ae4c3164075337d81e943845938
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Dec 21 20:45:40 2011 +0100

    ScChangeActionTable conversion: another correction

diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 937fb97..d38d0ce 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -3143,13 +3143,16 @@ void ScChangeTrack::Undo( sal_uLong nStartAction, sal_uLong nEndAction, bool bMe
                             {
                                 ScChangeActionMap::iterator itCut = aPasteCutMap.find( nCut );
 
-                                if ( itCut == aMap.end() )
+                                if ( itCut != aPasteCutMap.end() )
+                                {
+                                    OSL_ENSURE( aMap.find( nCut ) == aMap.end(), "ScChangeTrack::Undo: nCut dup" );
+                                    Append( itCut->second, nCut );
+                                    aPasteCutMap.erase( itCut );
+                                }
+                                else
                                 {
                                     OSL_FAIL( "ScChangeTrack::Undo: nCut not found" );
                                 }
-
-                                Append( itCut->second, nCut );
-                                aPasteCutMap.erase( nCut );
                             }
                             EndBlockModify( nEnd );
                             ResetLastCut();