diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-05-15 09:03:57 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-15 12:05:47 +0100 |
| commit | 9b71aa0de186d534f4dc79b587f0cd6d8e17e590 (patch) | |
| tree | 51e5e389120cab2f6e170a7d6aedded1558c351f /svl | |
| parent | 844bba4bb44966a1d27f55c4e511eb7f5887d147 (diff) | |
convert GetUndoActionComment family to rtl::OUString
Change-Id: I36ccf62ee2e2769bcf1aef6d26d96bce6c7078f0
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/inc/svl/undo.hxx | 8 | ||||
| -rw-r--r-- | svl/source/undo/undo.cxx | 8 |
2 files changed, 7 insertions, 9 deletions
diff --git a/svl/inc/svl/undo.hxx b/svl/inc/svl/undo.hxx index a6b3fd646168..58c620c013a6 100644 --- a/svl/inc/svl/undo.hxx +++ b/svl/inc/svl/undo.hxx @@ -242,11 +242,11 @@ namespace svl virtual size_t GetUndoActionCount( bool const i_currentLevel = CurrentLevel ) const = 0; virtual sal_uInt16 GetUndoActionId() const = 0; - virtual UniString GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const = 0; + virtual rtl::OUString GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const = 0; virtual SfxUndoAction* GetUndoAction( size_t nNo=0 ) const = 0; virtual size_t GetRedoActionCount( bool const i_currentLevel = CurrentLevel ) const = 0; - virtual UniString GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const = 0; + virtual rtl::OUString GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const = 0; virtual sal_Bool Undo() = 0; virtual sal_Bool Redo() = 0; @@ -356,10 +356,10 @@ public: virtual void AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg=sal_False ); virtual size_t GetUndoActionCount( bool const i_currentLevel = CurrentLevel ) const; virtual sal_uInt16 GetUndoActionId() const; - virtual UniString GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const; + virtual rtl::OUString GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const; virtual SfxUndoAction* GetUndoAction( size_t nNo=0 ) const; virtual size_t GetRedoActionCount( bool const i_currentLevel = CurrentLevel ) const; - virtual UniString GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const; + virtual rtl::OUString GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const; virtual sal_Bool Undo(); virtual sal_Bool Redo(); virtual void Clear(); diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx index 91836647d1a2..e27bf00e5ba4 100644 --- a/svl/source/undo/undo.cxx +++ b/svl/source/undo/undo.cxx @@ -691,17 +691,15 @@ size_t SfxUndoManager::GetUndoActionCount( bool const i_currentLevel ) const //------------------------------------------------------------------------ -XubString SfxUndoManager::GetUndoActionComment( size_t nNo, bool const i_currentLevel ) const +rtl::OUString SfxUndoManager::GetUndoActionComment( size_t nNo, bool const i_currentLevel ) const { UndoManagerGuard aGuard( *m_pData ); - String sComment; + rtl::OUString sComment; const SfxUndoArray* pUndoArray = i_currentLevel ? m_pData->pActUndoArray : m_pData->pUndoArray; DBG_ASSERT( nNo < pUndoArray->nCurUndoAction, "svl::SfxUndoManager::GetUndoActionComment: illegal index!" ); if( nNo < pUndoArray->nCurUndoAction ) - { sComment = pUndoArray->aUndoActions[ pUndoArray->nCurUndoAction - 1 - nNo ].pAction->GetComment(); - } return sComment; } @@ -852,7 +850,7 @@ size_t SfxUndoManager::ImplGetRedoActionCount_Lock( bool const i_currentLevel ) //------------------------------------------------------------------------ -XubString SfxUndoManager::GetRedoActionComment( size_t nNo, bool const i_currentLevel ) const +rtl::OUString SfxUndoManager::GetRedoActionComment( size_t nNo, bool const i_currentLevel ) const { UndoManagerGuard aGuard( *m_pData ); const SfxUndoArray* pUndoArray = i_currentLevel ? m_pData->pActUndoArray : m_pData->pUndoArray; |