diff options
| -rw-r--r-- | comphelper/inc/comphelper/asyncnotification.hxx | 3 | ||||
| -rw-r--r-- | svl/inc/svl/undo.hxx | 2 | ||||
| -rw-r--r-- | svl/source/undo/undo.cxx | 10 |
3 files changed, 8 insertions, 7 deletions
diff --git a/comphelper/inc/comphelper/asyncnotification.hxx b/comphelper/inc/comphelper/asyncnotification.hxx index fc4dfcd48dd9..22d901728ef7 100644 --- a/comphelper/inc/comphelper/asyncnotification.hxx +++ b/comphelper/inc/comphelper/asyncnotification.hxx @@ -131,8 +131,9 @@ namespace comphelper virtual oslInterlockedCount SAL_CALL acquire(); virtual oslInterlockedCount SAL_CALL release(); - /// creates (starts) the thread using AsyncEventNotifier_TBASE::create; + using AsyncEventNotifier_TBASE::join; + using AsyncEventNotifier_TBASE::getIdentifier; using AsyncEventNotifier_TBASE::operator new; using AsyncEventNotifier_TBASE::operator delete; diff --git a/svl/inc/svl/undo.hxx b/svl/inc/svl/undo.hxx index ce7a94dd50de..de9c26c7a946 100644 --- a/svl/inc/svl/undo.hxx +++ b/svl/inc/svl/undo.hxx @@ -145,7 +145,7 @@ public: virtual void cleared() = 0; virtual void clearedRedo() = 0; virtual void listActionEntered( const String& i_comment ) = 0; - virtual void listActionLeft() = 0; + virtual void listActionLeft( const String& i_comment ) = 0; virtual void listActionLeftAndMerged() = 0; virtual void listActionCancelled() = 0; virtual void undoManagerDying() = 0; diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx index e401c4843258..f9a51a6bf53d 100644 --- a/svl/source/undo/undo.cxx +++ b/svl/source/undo/undo.cxx @@ -978,7 +978,7 @@ USHORT SfxUndoManager::ImplLeaveListAction( const bool i_merge ) // If no undo action where added, delete the undo list action const USHORT nListActionElements = pArrayToLeave->nCurUndoAction; - if( nListActionElements == 0 ) + if ( nListActionElements == 0 ) { SfxUndoAction* pCurrentAction= m_pData->pActUndoArray->aUndoActions[ m_pData->pActUndoArray->nCurUndoAction-1 ]; m_pData->pActUndoArray->aUndoActions.Remove( --m_pData->pActUndoArray->nCurUndoAction ); @@ -991,9 +991,9 @@ USHORT SfxUndoManager::ImplLeaveListAction( const bool i_merge ) SfxUndoAction* pCurrentAction= m_pData->pActUndoArray->aUndoActions[ m_pData->pActUndoArray->nCurUndoAction-1 ]; SfxListUndoAction* pListAction = dynamic_cast< SfxListUndoAction * >( pCurrentAction ); - OSL_ENSURE( pListAction, "SfxUndoManager::ImplLeaveListAction: list action expected at this position!" ); + ENSURE_OR_RETURN( pListAction, "SfxUndoManager::ImplLeaveListAction: list action expected at this position!", nListActionElements ); - if ( pListAction && i_merge ) + if ( i_merge ) { // merge the list action with its predecessor on the same level OSL_ENSURE( m_pData->pActUndoArray->nCurUndoAction > 1, @@ -1011,7 +1011,7 @@ USHORT SfxUndoManager::ImplLeaveListAction( const bool i_merge ) } // if the undo array has no comment, try to get it from its children - if ( pListAction && pListAction->GetComment().Len() == 0 ) + if ( pListAction->GetComment().Len() == 0 ) { for( USHORT n = 0; n < pListAction->aUndoActions.Count(); n++ ) { @@ -1024,7 +1024,7 @@ USHORT SfxUndoManager::ImplLeaveListAction( const bool i_merge ) } // notify listeners - aGuard.scheduleNotification( &SfxUndoListener::listActionLeft ); + aGuard.scheduleNotification( &SfxUndoListener::listActionLeft, pListAction->GetComment() ); // outta here return nListActionElements; |