From 9b71aa0de186d534f4dc79b587f0cd6d8e17e590 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 15 May 2012 09:03:57 +0100 Subject: convert GetUndoActionComment family to rtl::OUString Change-Id: I36ccf62ee2e2769bcf1aef6d26d96bce6c7078f0 --- svl/source/undo/undo.cxx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'svl/source/undo/undo.cxx') 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; -- cgit