diff options
Diffstat (limited to 'sd')
| -rwxr-xr-x | sd/inc/undo/undomanager.hxx | 2 | ||||
| -rwxr-xr-x | sd/source/core/undo/undomanager.cxx | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx index c1cb440f9a70..a02dd57886d1 100755 --- a/sd/inc/undo/undomanager.hxx +++ b/sd/inc/undo/undomanager.hxx @@ -40,7 +40,7 @@ public: UndoManager( USHORT nMaxUndoActionCount = 20 ); virtual void EnterListAction(const UniString &rComment, const UniString& rRepeatComment, USHORT nId=0); - virtual void LeaveListAction(); + virtual USHORT LeaveListAction(); virtual void AddUndoAction( SfxUndoAction *pAction, BOOL bTryMerg=FALSE ); diff --git a/sd/source/core/undo/undomanager.cxx b/sd/source/core/undo/undomanager.cxx index a076ec8b4a08..4ebefe9fd469 100755 --- a/sd/source/core/undo/undomanager.cxx +++ b/sd/source/core/undo/undomanager.cxx @@ -49,11 +49,12 @@ void UndoManager::EnterListAction(const UniString &rComment, const UniString& rR } } -void UndoManager::LeaveListAction() +USHORT UndoManager::LeaveListAction() { + USHORT nListElements = 0; if( !isInUndo() ) { - SfxUndoManager::LeaveListAction(); + nListElements = SfxUndoManager::LeaveListAction(); if( mnListLevel ) { mnListLevel--; @@ -63,6 +64,7 @@ void UndoManager::LeaveListAction() DBG_ERROR("sd::UndoManager::LeaveListAction(), no open list action!" ); } } + return nListElements; } void UndoManager::AddUndoAction( SfxUndoAction *pAction, BOOL bTryMerg /* = FALSE */ ) |