diff options
Diffstat (limited to 'svx')
-rw-r--r-- | svx/inc/svx/svdundo.hxx | 40 | ||||
-rw-r--r-- | svx/source/form/fmundo.cxx | 6 | ||||
-rw-r--r-- | svx/source/inc/fmundo.hxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svdundo.cxx | 40 |
4 files changed, 45 insertions, 45 deletions
diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx index 5b924a4558d8..3b0436ad2d06 100644 --- a/svx/inc/svx/svdundo.hxx +++ b/svx/inc/svx/svdundo.hxx @@ -115,7 +115,7 @@ public: void SetComment(const String& rStr) { aComment=rStr; } void SetObjDescription(const String& rStr) { aObjDescription=rStr; } - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; virtual String GetSdrRepeatComment(SdrView& rView) const; virtual void Undo(); @@ -188,7 +188,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; virtual String GetSdrRepeatComment(SdrView& rView) const; virtual void SdrRepeat(SdrView& rView); @@ -218,7 +218,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; virtual String GetSdrRepeatComment(SdrView& rView) const; virtual void SdrRepeat(SdrView& rView); @@ -248,7 +248,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; }; //************************************************************ @@ -334,7 +334,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; virtual String GetSdrRepeatComment(SdrView& rView) const; virtual void SdrRepeat(SdrView& rView); @@ -358,9 +358,9 @@ public: virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; - static String GetComment( const SdrObject& _rForObject ); + static rtl::OUString GetComment( const SdrObject& _rForObject ); }; //************************************************************ @@ -409,7 +409,7 @@ public: SdrUndoCopyObj(SdrObject& rNewObj, bool bOrdNumDirect = false) : SdrUndoNewObj(rNewObj,bOrdNumDirect) {} - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; }; //************************************************************ @@ -428,7 +428,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; }; ////////////////////////////////////////////////////////////////////////////// @@ -470,7 +470,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; virtual String GetSdrRepeatComment(SdrView& rView) const; virtual void SdrRepeat(SdrView& rView); @@ -502,7 +502,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; }; //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -553,7 +553,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; }; //************************************************************ @@ -572,7 +572,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; }; //************************************************************ @@ -593,7 +593,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; }; //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -674,7 +674,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; virtual String GetSdrRepeatComment(SdrView& rView) const; virtual void SdrRepeat(SdrView& rView); @@ -697,7 +697,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; }; //************************************************************ @@ -713,7 +713,7 @@ class SdrUndoCopyPage : public SdrUndoNewPage public: SdrUndoCopyPage(SdrPage& rNewPg): SdrUndoNewPage(rNewPg) {} - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; virtual String GetSdrRepeatComment(SdrView& rView) const; virtual void SdrRepeat(SdrView& rView); @@ -741,7 +741,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; }; //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -794,7 +794,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; }; //************************************************************ @@ -818,7 +818,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; }; /////////////////////////////////////////////////////////////////////// diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 67f89bc51c6c..9c8d9658fb22 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -1055,7 +1055,7 @@ void FmUndoPropertyAction::Redo() } //------------------------------------------------------------------------------ -String FmUndoPropertyAction::GetComment() const +rtl::OUString FmUndoPropertyAction::GetComment() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmUndoPropertyAction::GetComment" ); String aStr(static_STR_UNDO_PROPERTY); @@ -1315,10 +1315,10 @@ void FmUndoModelReplaceAction::Undo() } //------------------------------------------------------------------------------ -String FmUndoModelReplaceAction::GetComment() const +rtl::OUString FmUndoModelReplaceAction::GetComment() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmUndoModelReplaceAction::GetComment" ); - return SVX_RES(RID_STR_UNDO_MODEL_REPLACE); + return SVX_RESSTR(RID_STR_UNDO_MODEL_REPLACE); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx index 3396bca06d1d..c6ef1e3a46e7 100644 --- a/svx/source/inc/fmundo.hxx +++ b/svx/source/inc/fmundo.hxx @@ -80,7 +80,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; }; @@ -142,7 +142,7 @@ public: virtual void Undo(); virtual void Redo() { Undo(); } - virtual String GetComment() const; + virtual rtl::OUString GetComment() const; static void DisposeElement( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& xReplaced ); }; diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 48c4180a2e36..b3fca80dfb3b 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -143,7 +143,7 @@ void SdrUndoGroup::Redo() } } -XubString SdrUndoGroup::GetComment() const +rtl::OUString SdrUndoGroup::GetComment() const { XubString aRet(aComment); @@ -506,7 +506,7 @@ void SdrUndoAttrObj::Redo() ImpShowPageOfThisObject(); } -XubString SdrUndoAttrObj::GetComment() const +rtl::OUString SdrUndoAttrObj::GetComment() const { XubString aStr; @@ -569,7 +569,7 @@ void SdrUndoMoveObj::Redo() ImpShowPageOfThisObject(); } -XubString SdrUndoMoveObj::GetComment() const +rtl::OUString SdrUndoMoveObj::GetComment() const { XubString aStr; ImpTakeDescriptionStr(STR_EditMove,aStr); @@ -664,7 +664,7 @@ void SdrUndoGeoObj::Redo() ImpShowPageOfThisObject(); } -XubString SdrUndoGeoObj::GetComment() const +rtl::OUString SdrUndoGeoObj::GetComment() const { XubString aStr; ImpTakeDescriptionStr(STR_DragMethObjOwn,aStr); @@ -818,7 +818,7 @@ void SdrUndoDelObj::Redo() SetOwner(sal_True); } -XubString SdrUndoDelObj::GetComment() const +rtl::OUString SdrUndoDelObj::GetComment() const { XubString aStr; ImpTakeDescriptionStr(STR_EditDelete,aStr); @@ -858,14 +858,14 @@ void SdrUndoNewObj::Redo() SetOwner(sal_False); } -String SdrUndoNewObj::GetComment( const SdrObject& _rForObject ) +rtl::OUString SdrUndoNewObj::GetComment( const SdrObject& _rForObject ) { String sComment; GetDescriptionStringForObject( _rForObject, STR_UndoInsertObj, sComment ); return sComment; } -XubString SdrUndoNewObj::GetComment() const +rtl::OUString SdrUndoNewObj::GetComment() const { XubString aStr; ImpTakeDescriptionStr(STR_UndoInsertObj,aStr); @@ -963,7 +963,7 @@ void SdrUndoReplaceObj::SetOldOwner(bool bNew) //////////////////////////////////////////////////////////////////////////////////////////////////// -XubString SdrUndoCopyObj::GetComment() const +rtl::OUString SdrUndoCopyObj::GetComment() const { XubString aStr; ImpTakeDescriptionStr(STR_UndoCopyObj,aStr); @@ -1027,7 +1027,7 @@ void SdrUndoObjOrdNum::Redo() ImpShowPageOfThisObject(); } -XubString SdrUndoObjOrdNum::GetComment() const +rtl::OUString SdrUndoObjOrdNum::GetComment() const { XubString aStr; ImpTakeDescriptionStr(STR_UndoObjOrdNum,aStr); @@ -1110,7 +1110,7 @@ void SdrUndoObjSetText::Redo() ImpShowPageOfThisObject(); } -XubString SdrUndoObjSetText::GetComment() const +rtl::OUString SdrUndoObjSetText::GetComment() const { XubString aStr; ImpTakeDescriptionStr(STR_UndoObjSetText,aStr); @@ -1229,7 +1229,7 @@ void SdrUndoObjStrAttr::Redo() ImpShowPageOfThisObject(); } -String SdrUndoObjStrAttr::GetComment() const +rtl::OUString SdrUndoObjStrAttr::GetComment() const { String aStr; switch ( meObjStrAttr ) @@ -1295,7 +1295,7 @@ void SdrUndoNewLayer::Redo() pLayerAdmin->InsertLayer(pLayer,nNum); } -XubString SdrUndoNewLayer::GetComment() const +rtl::OUString SdrUndoNewLayer::GetComment() const { return ImpGetResStr(STR_UndoNewLayer); } @@ -1320,7 +1320,7 @@ void SdrUndoDelLayer::Redo() DBG_ASSERT(pCmpLayer==pLayer,"SdrUndoDelLayer::Redo(): Removed layer is != pLayer."); } -XubString SdrUndoDelLayer::GetComment() const +rtl::OUString SdrUndoDelLayer::GetComment() const { return ImpGetResStr(STR_UndoDelLayer); } @@ -1347,7 +1347,7 @@ void SdrUndoMoveLayer::Redo() pLayerAdmin->InsertLayer(pLayer,nNeuPos); } -XubString SdrUndoMoveLayer::GetComment() const +rtl::OUString SdrUndoMoveLayer::GetComment() const { return ImpGetResStr(STR_UndoMovLayer); } @@ -1480,7 +1480,7 @@ void SdrUndoDelPage::Redo() bItsMine=sal_True; } -XubString SdrUndoDelPage::GetComment() const +rtl::OUString SdrUndoDelPage::GetComment() const { XubString aStr; ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,sal_False); @@ -1519,7 +1519,7 @@ void SdrUndoNewPage::Redo() bItsMine=sal_False; } -XubString SdrUndoNewPage::GetComment() const +rtl::OUString SdrUndoNewPage::GetComment() const { XubString aStr; ImpTakeDescriptionStr(STR_UndoNewPage,aStr,0,sal_False); @@ -1528,7 +1528,7 @@ XubString SdrUndoNewPage::GetComment() const //////////////////////////////////////////////////////////////////////////////////////////////////// -XubString SdrUndoCopyPage::GetComment() const +rtl::OUString SdrUndoCopyPage::GetComment() const { XubString aStr; ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,sal_False); @@ -1564,7 +1564,7 @@ void SdrUndoSetPageNum::Redo() ImpMovePage(nOldPageNum,nNewPageNum); } -XubString SdrUndoSetPageNum::GetComment() const +rtl::OUString SdrUndoSetPageNum::GetComment() const { XubString aStr; ImpTakeDescriptionStr(STR_UndoMovPage,aStr,0,sal_False); @@ -1608,7 +1608,7 @@ void SdrUndoPageRemoveMasterPage::Redo() mrPage.TRG_ClearMasterPage(); } -XubString SdrUndoPageRemoveMasterPage::GetComment() const +rtl::OUString SdrUndoPageRemoveMasterPage::GetComment() const { XubString aStr; ImpTakeDescriptionStr(STR_UndoDelPageMasterDscr,aStr,0,sal_False); @@ -1653,7 +1653,7 @@ void SdrUndoPageChangeMasterPage::Redo() } } -XubString SdrUndoPageChangeMasterPage::GetComment() const +rtl::OUString SdrUndoPageChangeMasterPage::GetComment() const { XubString aStr; ImpTakeDescriptionStr(STR_UndoChgPageMasterDscr,aStr,0,sal_False); |