diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-05-14 08:34:58 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-14 14:34:09 +0100 |
| commit | c182a752412aab354aaf02ee0c75b7cb1ee35d66 (patch) | |
| tree | e4ee080ed6a7c5f665a33c52ad9d1e3a56b6031b /svl | |
| parent | 28062c62818ce40c17fb67b480612f8bb9bcd522 (diff) | |
convert GetComment family to rtl::OUString
Change-Id: I563ab83a24ca4f839892548b350486e83dd071d3
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/inc/svl/undo.hxx | 6 | ||||
| -rw-r--r-- | svl/source/undo/undo.cxx | 15 |
2 files changed, 10 insertions, 11 deletions
diff --git a/svl/inc/svl/undo.hxx b/svl/inc/svl/undo.hxx index 828810a541a8..a6b3fd646168 100644 --- a/svl/inc/svl/undo.hxx +++ b/svl/inc/svl/undo.hxx @@ -76,7 +76,7 @@ public: virtual sal_Bool Merge( SfxUndoAction *pNextAction ); - virtual UniString GetComment() const; + virtual rtl::OUString GetComment() const; virtual UniString GetRepeatComment(SfxRepeatTarget&) const; virtual sal_uInt16 GetId() const; @@ -183,7 +183,7 @@ class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArra virtual sal_Bool Merge( SfxUndoAction *pNextAction ); - virtual UniString GetComment() const; + virtual rtl::OUString GetComment() const; virtual UniString GetRepeatComment(SfxRepeatTarget&) const; virtual sal_uInt16 GetId() const; @@ -462,7 +462,7 @@ public: virtual void Repeat(SfxRepeatTarget&r); - virtual UniString GetComment() const; + virtual rtl::OUString GetComment() const; virtual UniString GetRepeatComment(SfxRepeatTarget&r) const; virtual sal_uInt16 GetId() const; diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx index 449b79a89e9d..91836647d1a2 100644 --- a/svl/source/undo/undo.cxx +++ b/svl/source/undo/undo.cxx @@ -103,10 +103,10 @@ sal_Bool SfxUndoAction::Merge( SfxUndoAction * ) //------------------------------------------------------------------------ -XubString SfxUndoAction::GetComment() const +rtl::OUString SfxUndoAction::GetComment() const { DBG_CHKTHIS(SfxUndoAction, 0); - return XubString(); + return rtl::OUString(); } //------------------------------------------------------------------------ @@ -1159,11 +1159,11 @@ size_t SfxUndoManager::ImplLeaveListAction( const bool i_merge, UndoManagerGuard } // if the undo array has no comment, try to get it from its children - if ( pListAction->GetComment().Len() == 0 ) + if ( pListAction->GetComment().isEmpty() ) { for( size_t n = 0; n < pListAction->aUndoActions.size(); n++ ) { - if( pListAction->aUndoActions[n].pAction->GetComment().Len() ) + if (!pListAction->aUndoActions[n].pAction->GetComment().isEmpty()) { pListAction->SetComment( pListAction->aUndoActions[n].pAction->GetComment() ); break; @@ -1294,7 +1294,7 @@ sal_uInt16 SfxListUndoAction::GetId() const //------------------------------------------------------------------------ -XubString SfxListUndoAction::GetComment() const +rtl::OUString SfxListUndoAction::GetComment() const { return aComment; } @@ -1454,12 +1454,11 @@ void SfxLinkUndoAction::Repeat(SfxRepeatTarget&r) //------------------------------------------------------------------------ -XubString SfxLinkUndoAction::GetComment() const +rtl::OUString SfxLinkUndoAction::GetComment() const { if ( pAction ) return pAction->GetComment(); - else - return XubString(); + return rtl::OUString(); } |