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 /sd | |
parent | 28062c62818ce40c17fb67b480612f8bb9bcd522 (diff) |
convert GetComment family to rtl::OUString
Change-Id: I563ab83a24ca4f839892548b350486e83dd071d3
Diffstat (limited to 'sd')
-rw-r--r-- | sd/inc/sdundo.hxx | 2 | ||||
-rw-r--r-- | sd/inc/undoanim.hxx | 6 | ||||
-rw-r--r-- | sd/source/core/undoanim.cxx | 12 | ||||
-rw-r--r-- | sd/source/ui/dlg/unchss.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/func/unmovss.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/func/unprlout.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/unchss.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/unmodpg.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/unmovss.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/unprlout.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/unmodpg.cxx | 4 |
11 files changed, 21 insertions, 21 deletions
diff --git a/sd/inc/sdundo.hxx b/sd/inc/sdundo.hxx index bbf39e2076b0..6356dd45b9a1 100644 --- a/sd/inc/sdundo.hxx +++ b/sd/inc/sdundo.hxx @@ -43,7 +43,7 @@ public: virtual ~SdUndoAction() {} void SetComment(String& rStr) { maComment = rStr; } - virtual String GetComment() const { return maComment; } + virtual rtl::OUString GetComment() const { return maComment; } virtual SdUndoAction* Clone() const { return NULL; } protected: diff --git a/sd/inc/undoanim.hxx b/sd/inc/undoanim.hxx index 9af802794671..5bb678c63e09 100644 --- a/sd/inc/undoanim.hxx +++ b/sd/inc/undoanim.hxx @@ -51,7 +51,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; private: UndoAnimationImpl* mpImpl; @@ -67,7 +67,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; private: UndoAnimationPathImpl* mpImpl; @@ -84,7 +84,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; private: UndoTransitionImpl* mpImpl; diff --git a/sd/source/core/undoanim.cxx b/sd/source/core/undoanim.cxx index 79f6ede05ab3..f20b83102f96 100644 --- a/sd/source/core/undoanim.cxx +++ b/sd/source/core/undoanim.cxx @@ -115,9 +115,9 @@ void UndoAnimation::Redo() } } -String UndoAnimation::GetComment() const +rtl::OUString UndoAnimation::GetComment() const { - return String(SdResId(STR_UNDO_ANIMATION)); + return SdResId(STR_UNDO_ANIMATION).toString(); } struct UndoAnimationPathImpl @@ -193,9 +193,9 @@ void UndoAnimationPath::Redo() } } -String UndoAnimationPath::GetComment() const +rtl::OUString UndoAnimationPath::GetComment() const { - return String(SdResId(STR_UNDO_ANIMATION)); + return SdResId(STR_UNDO_ANIMATION).toString(); } struct UndoTransitionImpl @@ -284,9 +284,9 @@ void UndoTransition::Redo() mpImpl->mpPage->mbStopSound = mpImpl->mbNewStopSound; } -String UndoTransition::GetComment() const +rtl::OUString UndoTransition::GetComment() const { - return String(SdResId(STR_UNDO_SLIDE_PARAMS)); + return SdResId(STR_UNDO_SLIDE_PARAMS).toString(); } } diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx index fba5c61a2611..5b53ba0c7ab7 100644 --- a/sd/source/ui/dlg/unchss.cxx +++ b/sd/source/ui/dlg/unchss.cxx @@ -171,7 +171,7 @@ StyleSheetUndoAction::~StyleSheetUndoAction() |* \************************************************************************/ -String StyleSheetUndoAction::GetComment() const +rtl::OUString StyleSheetUndoAction::GetComment() const { return aComment; } diff --git a/sd/source/ui/func/unmovss.cxx b/sd/source/ui/func/unmovss.cxx index 2b3d2b0d4484..e849da1c20b8 100644 --- a/sd/source/ui/func/unmovss.cxx +++ b/sd/source/ui/func/unmovss.cxx @@ -99,9 +99,9 @@ SdMoveStyleSheetsUndoAction::~SdMoveStyleSheetsUndoAction() { } -String SdMoveStyleSheetsUndoAction::GetComment() const +rtl::OUString SdMoveStyleSheetsUndoAction::GetComment() const { - return String(); + return rtl::OUString(); } diff --git a/sd/source/ui/func/unprlout.cxx b/sd/source/ui/func/unprlout.cxx index 60ff3a423809..6ace0a2a2984 100644 --- a/sd/source/ui/func/unprlout.cxx +++ b/sd/source/ui/func/unprlout.cxx @@ -109,7 +109,7 @@ SdPresentationLayoutUndoAction::~SdPresentationLayoutUndoAction() |* \************************************************************************/ -String SdPresentationLayoutUndoAction::GetComment() const +rtl::OUString SdPresentationLayoutUndoAction::GetComment() const { return aComment; } diff --git a/sd/source/ui/inc/unchss.hxx b/sd/source/ui/inc/unchss.hxx index 481087783b65..64cef964ad07 100644 --- a/sd/source/ui/inc/unchss.hxx +++ b/sd/source/ui/inc/unchss.hxx @@ -53,7 +53,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; }; #endif // _SD_UNCHSS_HXX diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx index 83fc603d955a..8c733465bcf7 100644 --- a/sd/source/ui/inc/unmodpg.hxx +++ b/sd/source/ui/inc/unmodpg.hxx @@ -63,7 +63,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; }; // -------------------------------------------------------------------- @@ -76,7 +76,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; private: String maOldName; diff --git a/sd/source/ui/inc/unmovss.hxx b/sd/source/ui/inc/unmovss.hxx index 4299a07026db..595142b9809b 100644 --- a/sd/source/ui/inc/unmovss.hxx +++ b/sd/source/ui/inc/unmovss.hxx @@ -48,7 +48,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; }; #endif // _SD_UNMOVSS_HXX diff --git a/sd/source/ui/inc/unprlout.hxx b/sd/source/ui/inc/unprlout.hxx index c9130e6b2f0b..51b0022db980 100644 --- a/sd/source/ui/inc/unprlout.hxx +++ b/sd/source/ui/inc/unprlout.hxx @@ -59,7 +59,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; }; #endif // _SD_UNPRLOUT_HXX diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx index 615f09cc32bf..baead6bfd9a5 100644 --- a/sd/source/ui/view/unmodpg.cxx +++ b/sd/source/ui/view/unmodpg.cxx @@ -203,7 +203,7 @@ ModifyPageUndoAction::~ModifyPageUndoAction() |* \************************************************************************/ -String ModifyPageUndoAction::GetComment() const +rtl::OUString ModifyPageUndoAction::GetComment() const { return maComment; } @@ -239,7 +239,7 @@ void RenameLayoutTemplateUndoAction::Redo() mpDoc->RenameLayoutTemplate( aLayoutName, maNewName ); } -String RenameLayoutTemplateUndoAction::GetComment() const +rtl::OUString RenameLayoutTemplateUndoAction::GetComment() const { return maComment; } |