summaryrefslogtreecommitdiffstats
path: root/sc
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2011-12-21 20:45:40 +0100
committerEike Rathke <erack@redhat.com>2011-12-21 20:45:40 +0100
commitc1db721af6286ae4c3164075337d81e943845938 (patch)
treeb49a07465ea148627fbf848338b42c5a0be06348 /sc
parentScChangeActionTable conversion: small corrections (diff)
downloadcore-c1db721af6286ae4c3164075337d81e943845938.tar.gz
core-c1db721af6286ae4c3164075337d81e943845938.zip
ScChangeActionTable conversion: another correction
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/tool/chgtrack.cxx11
1 files changed, 7 insertions, 4 deletions
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 937fb9781892..d38d0ce42ef4 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();