diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-30 14:08:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-05 08:54:16 +0200 |
| commit | f4b76b7b160467a4d67689e1fe24d481df714ce5 (patch) | |
| tree | ad74f2b38f22ddd34cddb57c86b60e91e7e68afe /include | |
| parent | 4f305eb9df40e26294aba76d28b036609b40b8d4 (diff) | |
convert include/svx/svdundo.hxx from String to OUString
Also
- convert GetDescriptionStringForObject to return a result
rather taking an inout parameter
- convert SdrUndoFactory::CreateUndoObjectStrAttr to take
const references to OUString
Change-Id: Ie0c638635a7b80f818abe58319a2f366251feb62
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/svdundo.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index d7c62e5411a1..d3a8a8321e59 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -122,9 +122,9 @@ protected: protected: SdrUndoObj(SdrObject& rNewObj); - void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, bool bRepeat = false) const; + void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, bool bRepeat = false) const; - static void GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, String& rStr, bool bRepeat = false ); + static SAL_WARN_UNUSED_RESULT OUString GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, bool bRepeat = false ); // #94278# new method for evtl. PageChange at UNDO/REDO void ImpShowPageOfThisObject(); @@ -448,14 +448,14 @@ public: protected: const ObjStrAttrType meObjStrAttr; - const String msOldStr; - const String msNewStr; + const OUString msOldStr; + const OUString msNewStr; public: SdrUndoObjStrAttr( SdrObject& rNewObj, const ObjStrAttrType eObjStrAttr, - const String& sOldStr, - const String& sNewStr); + const OUString& sOldStr, + const OUString& sNewStr); virtual void Undo(); virtual void Redo(); @@ -560,7 +560,7 @@ protected: protected: SdrUndoPage(SdrPage& rNewPg); - void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 n=0, bool bRepeat = false) const; + void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 n=0, bool bRepeat = false) const; }; /** @@ -752,8 +752,8 @@ public: // Implement Title/Description Elements UI for Writer text frames, graphics and embedded objects (#i73249#) virtual SdrUndoAction* CreateUndoObjectStrAttr( SdrObject& rObject, SdrUndoObjStrAttr::ObjStrAttrType eObjStrAttrType, - String sOldStr, - String sNewStr ); + const OUString& sOldStr, + const OUString& sNewStr ); // Layer virtual SdrUndoAction* CreateUndoNewLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel); |