convert GetRepeatComment to OUString

Change-Id: Ibf75533d04b3c68b875f44ad22639934578867e3

sc/source/ui/inc/undobase.hxx

@@ -189,8 +189,8 @@ public:
     virtual void            Repeat(SfxRepeatTarget& rTarget);
     virtual sal_Bool        CanRepeat(SfxRepeatTarget& rTarget) const;
     virtual sal_Bool        Merge( SfxUndoAction *pNextAction );
-    virtual rtl::OUString   GetComment() const;
-    virtual String          GetRepeatComment(SfxRepeatTarget&) const;
+    virtual OUString        GetComment() const;
+    virtual OUString        GetRepeatComment(SfxRepeatTarget&) const;
     virtual sal_uInt16      GetId() const;
 };
 

sc/source/ui/inc/undodraw.hxx

@@ -55,8 +55,8 @@ public:
     virtual void            Repeat(SfxRepeatTarget& rTarget);
     virtual sal_Bool        CanRepeat(SfxRepeatTarget& rTarget) const;
     virtual sal_Bool        Merge( SfxUndoAction *pNextAction );
-    virtual rtl::OUString   GetComment() const;
-    virtual String          GetRepeatComment(SfxRepeatTarget&) const;
+    virtual OUString        GetComment() const;
+    virtual OUString        GetRepeatComment(SfxRepeatTarget&) const;
     virtual sal_uInt16      GetId() const;
 };
 

sc/source/ui/undo/undobase.cxx

@@ -555,12 +555,11 @@ rtl::OUString ScUndoWrapper::GetComment() const
     return rtl::OUString();
 }
 
-String ScUndoWrapper::GetRepeatComment(SfxRepeatTarget& rTarget) const
+OUString ScUndoWrapper::GetRepeatComment(SfxRepeatTarget& rTarget) const
 {
     if (pWrappedUndo)
         return pWrappedUndo->GetRepeatComment(rTarget);
-    else
-        return String();
+    return OUString();
 }
 
 sal_uInt16 ScUndoWrapper::GetId() const

sc/source/ui/undo/undodraw.cxx

@@ -57,12 +57,11 @@ rtl::OUString ScUndoDraw::GetComment() const
     return rtl::OUString();
 }
 
-String ScUndoDraw::GetRepeatComment(SfxRepeatTarget& rTarget) const
+OUString ScUndoDraw::GetRepeatComment(SfxRepeatTarget& rTarget) const
 {
     if (pDrawUndo)
         return pDrawUndo->GetRepeatComment(rTarget);
-    else
-        return String();
+    return OUString();
 }
 
 sal_uInt16 ScUndoDraw::GetId() const

sd/inc/undo/undomanager.hxx

@@ -31,7 +31,7 @@ class UndoManager : public SfxUndoManager
 public:
     UndoManager( sal_uInt16 nMaxUndoActionCount = 20 );
 
-    virtual void            EnterListAction(const UniString &rComment, const UniString& rRepeatComment, sal_uInt16 nId=0);
+    virtual void            EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId=0);
 
     virtual void            AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg=sal_False );
 

sd/source/core/undo/undomanager.cxx

@@ -27,7 +27,7 @@ UndoManager::UndoManager( sal_uInt16 nMaxUndoActionCount /* = 20 */ )
 {
 }
 
-void UndoManager::EnterListAction(const UniString &rComment, const UniString& rRepeatComment, sal_uInt16 nId /* =0 */)
+void UndoManager::EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId /* =0 */)
 {
     if( !IsDoing() )
     {

svl/inc/svl/undo.hxx

@@ -66,8 +66,8 @@ public:
 
     virtual sal_Bool            Merge( SfxUndoAction *pNextAction );
 
-    virtual rtl::OUString   GetComment() const;
-    virtual UniString       GetRepeatComment(SfxRepeatTarget&) const;
+    virtual OUString    GetComment() const;
+    virtual OUString    GetRepeatComment(SfxRepeatTarget&) const;
     virtual sal_uInt16  GetId() const;
 
 private:
@@ -162,8 +162,8 @@ class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArra
     public:
                             TYPEINFO();
 
-                            SfxListUndoAction( const UniString &rComment,
-                                const UniString rRepeatComment, sal_uInt16 Id, SfxUndoArray *pFather);
+                            SfxListUndoAction( const OUString &rComment,
+                                const OUString rRepeatComment, sal_uInt16 Id, SfxUndoArray *pFather);
     virtual void            Undo();
     virtual void            UndoWithContext( SfxUndoContext& i_context );
     virtual void            Redo();
@@ -173,17 +173,17 @@ class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArra
 
     virtual sal_Bool            Merge( SfxUndoAction *pNextAction );
 
-    virtual rtl::OUString   GetComment() const;
-    virtual UniString       GetRepeatComment(SfxRepeatTarget&) const;
+    virtual OUString    GetComment() const;
+    virtual OUString    GetRepeatComment(SfxRepeatTarget&) const;
     virtual sal_uInt16  GetId() const;
 
-    void SetComment( const UniString& rComment );
+    void SetComment(const OUString& rComment);
 
     private:
 
     sal_uInt16          nId;
-    UniString               aComment;
-    UniString               aRepeatComment;
+    OUString            aComment;
+    OUString            aRepeatComment;
 
 };
 
@@ -232,11 +232,11 @@ namespace svl
 
         virtual size_t          GetUndoActionCount( bool const i_currentLevel = CurrentLevel ) const = 0;
         virtual sal_uInt16      GetUndoActionId() const = 0;
-        virtual rtl::OUString   GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const = 0;
+        virtual OUString        GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const = 0;
         virtual SfxUndoAction*  GetUndoAction( size_t nNo=0 ) const = 0;
 
         virtual size_t          GetRedoActionCount( bool const i_currentLevel = CurrentLevel ) const = 0;
-        virtual rtl::OUString   GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const = 0;
+        virtual OUString        GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const = 0;
 
         virtual sal_Bool        Undo() = 0;
         virtual sal_Bool        Redo() = 0;
@@ -267,11 +267,11 @@ namespace svl
         virtual bool            IsDoing() const = 0;
 
         virtual size_t          GetRepeatActionCount() const = 0;
-        virtual UniString       GetRepeatActionComment( SfxRepeatTarget &rTarget) const = 0;
+        virtual OUString        GetRepeatActionComment( SfxRepeatTarget &rTarget) const = 0;
         virtual sal_Bool        Repeat( SfxRepeatTarget &rTarget ) = 0;
         virtual sal_Bool        CanRepeat( SfxRepeatTarget &rTarget ) const = 0;
 
-        virtual void            EnterListAction(const UniString &rComment, const UniString& rRepeatComment, sal_uInt16 nId=0) = 0;
+        virtual void            EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId=0) = 0;
 
         /** leaves the list action entered with EnterListAction
             @return the number of the sub actions in the list which has just been left. Note that in case no such
@@ -351,10 +351,10 @@ public:
     virtual void            AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg=sal_False );
     virtual size_t          GetUndoActionCount( bool const i_currentLevel = CurrentLevel ) const;
     virtual sal_uInt16      GetUndoActionId() const;
-    virtual rtl::OUString   GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const;
+    virtual OUString        GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const;
     virtual SfxUndoAction*  GetUndoAction( size_t nNo=0 ) const;
     virtual size_t          GetRedoActionCount( bool const i_currentLevel = CurrentLevel ) const;
-    virtual rtl::OUString   GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const;
+    virtual OUString        GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const;
     virtual sal_Bool        Undo();
     virtual sal_Bool        Redo();
     virtual void            Clear();
@@ -362,10 +362,10 @@ public:
     virtual void            Reset();
     virtual bool            IsDoing() const;
     virtual size_t          GetRepeatActionCount() const;
-    virtual UniString       GetRepeatActionComment( SfxRepeatTarget &rTarget) const;
+    virtual OUString        GetRepeatActionComment( SfxRepeatTarget &rTarget) const;
     virtual sal_Bool        Repeat( SfxRepeatTarget &rTarget );
     virtual sal_Bool        CanRepeat( SfxRepeatTarget &rTarget ) const;
-    virtual void            EnterListAction(const UniString &rComment, const UniString& rRepeatComment, sal_uInt16 nId=0);
+    virtual void            EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId=0);
     virtual size_t          LeaveListAction();
     virtual size_t          LeaveAndMergeListAction();
     virtual bool            IsInListAction() const;
@@ -457,8 +457,8 @@ public:
 
     virtual void            Repeat(SfxRepeatTarget&r);
 
-    virtual rtl::OUString   GetComment() const;
-    virtual UniString       GetRepeatComment(SfxRepeatTarget&r) const;
+    virtual OUString    GetComment() const;
+    virtual OUString    GetRepeatComment(SfxRepeatTarget&r) const;
     virtual sal_uInt16  GetId() const;
 
     SfxUndoAction*          GetAction() const { return pAction; }

svl/source/undo/undo.cxx

@@ -94,10 +94,10 @@ sal_Bool SfxUndoAction::Merge( SfxUndoAction * )
 
 //------------------------------------------------------------------------
 
-rtl::OUString SfxUndoAction::GetComment() const
+OUString SfxUndoAction::GetComment() const
 {
     DBG_CHKTHIS(SfxUndoAction, 0);
-    return rtl::OUString();
+    return OUString();
 }
 
 //------------------------------------------------------------------------
@@ -111,7 +111,7 @@ sal_uInt16 SfxUndoAction::GetId() const
 
 //------------------------------------------------------------------------
 
-XubString SfxUndoAction::GetRepeatComment(SfxRepeatTarget&) const
+OUString SfxUndoAction::GetRepeatComment(SfxRepeatTarget&) const
 {
     DBG_CHKTHIS(SfxUndoAction, 0);
     return GetComment();
@@ -681,11 +681,11 @@ size_t SfxUndoManager::GetUndoActionCount( bool const i_currentLevel ) const
 
 //------------------------------------------------------------------------
 
-rtl::OUString SfxUndoManager::GetUndoActionComment( size_t nNo, bool const i_currentLevel ) const
+OUString SfxUndoManager::GetUndoActionComment( size_t nNo, bool const i_currentLevel ) const
 {
     UndoManagerGuard aGuard( *m_pData );
 
-    rtl::OUString sComment;
+    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 )
@@ -840,7 +840,7 @@ size_t SfxUndoManager::ImplGetRedoActionCount_Lock( bool const i_currentLevel )
 
 //------------------------------------------------------------------------
 
-rtl::OUString SfxUndoManager::GetRedoActionComment( size_t nNo, bool const i_currentLevel ) const
+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;
@@ -933,7 +933,7 @@ size_t SfxUndoManager::GetRepeatActionCount() const
 
 //------------------------------------------------------------------------
 
-XubString SfxUndoManager::GetRepeatActionComment( SfxRepeatTarget &rTarget) const
+OUString SfxUndoManager::GetRepeatActionComment(SfxRepeatTarget &rTarget) const
 {
     UndoManagerGuard aGuard( *m_pData );
     return m_pData->pActUndoArray->aUndoActions[ m_pData->pActUndoArray->aUndoActions.size() - 1 ].pAction
@@ -999,7 +999,7 @@ void SfxUndoManager::RemoveUndoListener( SfxUndoListener& i_listener )
 //------------------------------------------------------------------------
 
 void SfxUndoManager::EnterListAction(
-    const XubString& rComment, const XubString &rRepeatComment, sal_uInt16 nId )
+    const OUString& rComment, const OUString &rRepeatComment, sal_uInt16 nId )
 
 /*  [Beschreibung]
 
@@ -1282,21 +1282,21 @@ sal_uInt16 SfxListUndoAction::GetId() const
 
 //------------------------------------------------------------------------
 
-rtl::OUString SfxListUndoAction::GetComment() const
+OUString SfxListUndoAction::GetComment() const
 {
     return aComment;
 }
 
 //------------------------------------------------------------------------
 
-void SfxListUndoAction::SetComment( const UniString& rComment )
+void SfxListUndoAction::SetComment(const OUString& rComment)
 {
     aComment = rComment;
 }
 
 //------------------------------------------------------------------------
 
-XubString SfxListUndoAction::GetRepeatComment(SfxRepeatTarget &) const
+OUString SfxListUndoAction::GetRepeatComment(SfxRepeatTarget &) const
 {
     return aRepeatComment;
 }
@@ -1306,8 +1306,8 @@ XubString SfxListUndoAction::GetRepeatComment(SfxRepeatTarget &) const
 
 SfxListUndoAction::SfxListUndoAction
 (
-    const XubString &rComment,
-    const XubString rRepeatComment,
+    const OUString &rComment,
+    const OUString rRepeatComment,
     sal_uInt16 Id,
     SfxUndoArray *pFather
 )
@@ -1442,22 +1442,21 @@ void SfxLinkUndoAction::Repeat(SfxRepeatTarget&r)
 
 //------------------------------------------------------------------------
 
-rtl::OUString SfxLinkUndoAction::GetComment() const
+OUString SfxLinkUndoAction::GetComment() const
 {
     if ( pAction )
         return pAction->GetComment();
-    return rtl::OUString();
+    return OUString();
 }
 
 
 //------------------------------------------------------------------------
 
-XubString SfxLinkUndoAction::GetRepeatComment(SfxRepeatTarget&r) const
+OUString SfxLinkUndoAction::GetRepeatComment(SfxRepeatTarget&r) const
 {
     if ( pAction )
         return pAction->GetRepeatComment(r);
-    else
-        return XubString();
+    return OUString();
 }
 
 //------------------------------------------------------------------------

svx/inc/svx/svdundo.hxx

@@ -77,8 +77,8 @@ public:
     virtual sal_Bool CanRepeat(SfxRepeatTarget& rView) const;
     virtual void Repeat(SfxRepeatTarget& rView);
 
-    virtual String GetRepeatComment(SfxRepeatTarget& rView) const;
-    virtual String GetSdrRepeatComment(SdrView& rView) const;
+    virtual OUString GetRepeatComment(SfxRepeatTarget& rView) const;
+    virtual OUString GetSdrRepeatComment(SdrView& rView) const;
 
     virtual bool CanSdrRepeat(SdrView& rView) const;
     virtual void SdrRepeat(SdrView& rView);
@@ -100,8 +100,8 @@ protected:
     std::vector<SdrUndoAction*> aBuf;
 
     // Beschreibung der Action, nicht expandiert (beinhaltet %O)
-    String                      aComment;
-    String                      aObjDescription;
+    OUString                    aComment;
+    OUString                    aObjDescription;
 
     SdrRepeatFunc               eFunction;
 
@@ -114,10 +114,10 @@ public:
     SdrUndoAction* GetAction(sal_uIntPtr nNum) const { return aBuf[nNum]; }
     void AddAction(SdrUndoAction* pAct);
 
-    void SetComment(const String& rStr) { aComment=rStr; }
-    void SetObjDescription(const String& rStr) { aObjDescription=rStr; }
-    virtual rtl::OUString GetComment() const;
-    virtual String GetSdrRepeatComment(SdrView& rView) const;
+    void SetComment(const OUString& rStr) { aComment=rStr; }
+    void SetObjDescription(const OUString& rStr) { aObjDescription=rStr; }
+    virtual OUString GetComment() const;
+    virtual OUString GetSdrRepeatComment(SdrView& rView) const;
 
     virtual void Undo();
     virtual void Redo();
@@ -189,8 +189,8 @@ public:
     virtual void Undo();
     virtual void Redo();
 
-    virtual rtl::OUString GetComment() const;
-    virtual String GetSdrRepeatComment(SdrView& rView) const;
+    virtual OUString GetComment() const;
+    virtual OUString GetSdrRepeatComment(SdrView& rView) const;
 
     virtual void SdrRepeat(SdrView& rView);
     virtual bool CanSdrRepeat(SdrView& rView) const;
@@ -220,8 +220,8 @@ public:
     virtual void Undo();
     virtual void Redo();
 
-    virtual rtl::OUString GetComment() const;
-    virtual String GetSdrRepeatComment(SdrView& rView) const;
+    virtual OUString GetComment() const;
+    virtual OUString GetSdrRepeatComment(SdrView& rView) const;
 
     virtual void SdrRepeat(SdrView& rView);
     virtual bool CanSdrRepeat(SdrView& rView) const;
@@ -250,7 +250,7 @@ public:
     virtual void Undo();
     virtual void Redo();
 
-    virtual rtl::OUString GetComment() const;
+    virtual OUString GetComment() const;
 };
 
 //************************************************************
@@ -336,8 +336,8 @@ public:
     virtual void Undo();
     virtual void Redo();
 
-    virtual rtl::OUString GetComment() const;
-    virtual String GetSdrRepeatComment(SdrView& rView) const;
+    virtual OUString GetComment() const;
+    virtual OUString GetSdrRepeatComment(SdrView& rView) const;
 
     virtual void SdrRepeat(SdrView& rView);
     virtual bool CanSdrRepeat(SdrView& rView) const;
@@ -360,9 +360,9 @@ public:
     virtual void Undo();
     virtual void Redo();
 
-    virtual rtl::OUString GetComment() const;
+    virtual OUString GetComment() const;
 
-    static  rtl::OUString GetComment( const SdrObject& _rForObject );
+    static  OUString GetComment(const SdrObject& _rForObject);
 };
 
 //************************************************************
@@ -411,7 +411,7 @@ public:
     SdrUndoCopyObj(SdrObject& rNewObj, bool bOrdNumDirect = false)
     :   SdrUndoNewObj(rNewObj,bOrdNumDirect) {}
 
-    virtual rtl::OUString GetComment() const;
+    virtual OUString GetComment() const;
 };
 
 //************************************************************
@@ -430,7 +430,7 @@ public:
     virtual void Undo();
     virtual void Redo();
 
-    virtual rtl::OUString GetComment() const;
+    virtual OUString GetComment() const;
 };
 
 //////////////////////////////////////////////////////////////////////////////
@@ -472,8 +472,8 @@ public:
     virtual void Undo();
     virtual void Redo();
 
-    virtual rtl::OUString GetComment() const;
-    virtual String GetSdrRepeatComment(SdrView& rView) const;
+    virtual OUString GetComment() const;
+    virtual OUString GetSdrRepeatComment(SdrView& rView) const;
 
     virtual void SdrRepeat(SdrView& rView);
     virtual bool CanSdrRepeat(SdrView& rView) const;
@@ -504,7 +504,7 @@ public:
     virtual void Undo();
     virtual void Redo();
 
-    virtual rtl::OUString GetComment() const;
+    virtual OUString GetComment() const;
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -555,7 +555,7 @@ public:
     virtual void Undo();
     virtual void Redo();
 
-    virtual rtl::OUString GetComment() const;
+    virtual OUString GetComment() const;
 };
 
 //************************************************************
@@ -574,7 +574,7 @@ public:
     virtual void Undo();
     virtual void Redo();
 
-    virtual rtl::OUString GetComment() const;
+    virtual OUString GetComment() const;
 };
 
 //************************************************************
@@ -595,7 +595,7 @@ public:
     virtual void Undo();
     virtual void Redo();
 
-    virtual rtl::OUString GetComment() const;
+    virtual OUString GetComment() const;
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -676,8 +676,8 @@ public:
     virtual void Undo();
     virtual void Redo();
 
-    virtual rtl::OUString GetComment() const;
-    virtual String GetSdrRepeatComment(SdrView& rView) const;
+    virtual OUString GetComment() const;
+    virtual OUString GetSdrRepeatComment(SdrView& rView) const;
 
     virtual void SdrRepeat(SdrView& rView);
     virtual bool CanSdrRepeat(SdrView& rView) const;
@@ -699,7 +699,7 @@ public:
     virtual void Undo();
     virtual void Redo();
 
-    virtual rtl::OUString GetComment() const;
+    virtual OUString GetComment() const;
 };
 
 //************************************************************
@@ -715,8 +715,8 @@ class SdrUndoCopyPage : public SdrUndoNewPage
 public:
     SdrUndoCopyPage(SdrPage& rNewPg): SdrUndoNewPage(rNewPg) {}
 
-    virtual rtl::OUString GetComment() const;
-    virtual String GetSdrRepeatComment(SdrView& rView) const;
+    virtual OUString GetComment() const;
+    virtual OUString GetSdrRepeatComment(SdrView& rView) const;
 
     virtual void SdrRepeat(SdrView& rView);
     virtual bool CanSdrRepeat(SdrView& rView) const;
@@ -743,7 +743,7 @@ public:
     virtual void Undo();
     virtual void Redo();
 
-    virtual rtl::OUString GetComment() const;
+    virtual OUString GetComment() const;
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -796,7 +796,7 @@ public:
     virtual void Undo();
     virtual void Redo();
 
-    virtual rtl::OUString GetComment() const;
+    virtual OUString GetComment() const;
 };
 
 //************************************************************
@@ -820,7 +820,7 @@ public:
     virtual void Undo();
     virtual void Redo();
 
-    virtual rtl::OUString GetComment() const;
+    virtual OUString GetComment() const;
 };
 
 ///////////////////////////////////////////////////////////////////////

svx/source/svdraw/svdundo.cxx

@@ -80,11 +80,11 @@ void SdrUndoAction::Repeat(SfxRepeatTarget& rView)
     DBG_ASSERT(pV!=NULL,"Repeat: SfxRepeatTarget that was handed over is not a SdrView");
 }
 
-XubString SdrUndoAction::GetRepeatComment(SfxRepeatTarget& rView) const
+OUString SdrUndoAction::GetRepeatComment(SfxRepeatTarget& rView) const
 {
     SdrView* pV=PTR_CAST(SdrView,&rView);
     if (pV!=NULL) return GetSdrRepeatComment(*pV);
-    return String();
+    return OUString();
 }
 
 bool SdrUndoAction::CanSdrRepeat(SdrView& /*rView*/) const
@@ -96,7 +96,7 @@ void SdrUndoAction::SdrRepeat(SdrView& /*rView*/)
 {
 }
 
-XubString SdrUndoAction::GetSdrRepeatComment(SdrView& /*rView*/) const
+OUString SdrUndoAction::GetSdrRepeatComment(SdrView& /*rView*/) const
 {
     return String();
 }
@@ -145,15 +145,9 @@ void SdrUndoGroup::Redo()
     }
 }
 
-rtl::OUString SdrUndoGroup::GetComment() const
+OUString SdrUndoGroup::GetComment() const
 {
-    XubString aRet(aComment);
-
-    String aSearchString(RTL_CONSTASCII_USTRINGPARAM("%1"));
-
-    aRet.SearchAndReplace(aSearchString, aObjDescription);
-
-    return aRet;
+    return aComment.replaceAll("%1", aObjDescription);
 }
 
 bool SdrUndoGroup::CanSdrRepeat(SdrView& rView) const
@@ -203,15 +197,9 @@ void SdrUndoGroup::SdrRepeat(SdrView& rView)
     } // switch
 }
 
-XubString SdrUndoGroup::GetSdrRepeatComment(SdrView& /*rView*/) const
+OUString SdrUndoGroup::GetSdrRepeatComment(SdrView& /*rView*/) const
 {
-    XubString aRet(aComment);
-
-    String aSearchString(RTL_CONSTASCII_USTRINGPARAM("%1"));
-
-    aRet.SearchAndReplace(aSearchString, ImpGetResStr(STR_ObjNameSingulPlural));
-
-    return aRet;
+    return aComment.replaceAll("%1", ImpGetResStr(STR_ObjNameSingulPlural));
 }
 
 SdrUndoObj::SdrUndoObj(SdrObject& rNewObj):
@@ -239,7 +227,6 @@ void SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, sa
         else
         {
             XubString aStr;
-
             _rForObject.TakeObjNameSingul(aStr);
             rStr.Insert(aStr, nPos);
         }
@@ -508,7 +495,7 @@ void SdrUndoAttrObj::Redo()
     ImpShowPageOfThisObject();
 }
 
-rtl::OUString SdrUndoAttrObj::GetComment() const
+OUString SdrUndoAttrObj::GetComment() const
 {
     XubString aStr;
 
@@ -537,7 +524,7 @@ bool SdrUndoAttrObj::CanSdrRepeat(SdrView& rView) const
     return (pRepeatSet!=0L && rView.AreObjectsMarked());
 }
 
-XubString SdrUndoAttrObj::GetSdrRepeatComment(SdrView& /*rView*/) const
+OUString SdrUndoAttrObj::GetSdrRepeatComment(SdrView& /*rView*/) const
 {
     XubString aStr;
 
@@ -573,7 +560,7 @@ void SdrUndoMoveObj::Redo()
     ImpShowPageOfThisObject();
 }
 
-rtl::OUString SdrUndoMoveObj::GetComment() const
+OUString SdrUndoMoveObj::GetComment() const
 {
     XubString aStr;
     ImpTakeDescriptionStr(STR_EditMove,aStr);
@@ -590,7 +577,7 @@ bool SdrUndoMoveObj::CanSdrRepeat(SdrView& rView) const
     return rView.AreObjectsMarked();
 }
 
-XubString SdrUndoMoveObj::GetSdrRepeatComment(SdrView& /*rView*/) const
+OUString SdrUndoMoveObj::GetSdrRepeatComment(SdrView& /*rView*/) const
 {
     XubString aStr;
     ImpTakeDescriptionStr(STR_EditMove,aStr,sal_True);
@@ -668,7 +655,7 @@ void SdrUndoGeoObj::Redo()
     ImpShowPageOfThisObject();
 }
 
-rtl::OUString SdrUndoGeoObj::GetComment() const
+OUString SdrUndoGeoObj::GetComment() const
 {
     XubString aStr;
     ImpTakeDescriptionStr(STR_DragMethObjOwn,aStr);
@@ -822,7 +809,7 @@ void SdrUndoDelObj::Redo()
     SetOwner(sal_True);
 }
 
-rtl::OUString SdrUndoDelObj::GetComment() const
+OUString SdrUndoDelObj::GetComment() const
 {
     XubString aStr;
     ImpTakeDescriptionStr(STR_EditDelete,aStr);
@@ -839,7 +826,7 @@ bool SdrUndoDelObj::CanSdrRepeat(SdrView& rView) const
     return rView.AreObjectsMarked();
 }
 
-XubString SdrUndoDelObj::GetSdrRepeatComment(SdrView& /*rView*/) const
+OUString SdrUndoDelObj::GetSdrRepeatComment(SdrView& /*rView*/) const
 {
     XubString aStr;
     ImpTakeDescriptionStr(STR_EditDelete,aStr,sal_True);
@@ -862,14 +849,14 @@ void SdrUndoNewObj::Redo()
     SetOwner(sal_False);
 }
 
-rtl::OUString SdrUndoNewObj::GetComment( const SdrObject& _rForObject )
+OUString SdrUndoNewObj::GetComment( const SdrObject& _rForObject )
 {
     String sComment;
     GetDescriptionStringForObject( _rForObject, STR_UndoInsertObj, sComment );
     return sComment;
 }
 
-rtl::OUString SdrUndoNewObj::GetComment() const
+OUString SdrUndoNewObj::GetComment() const
 {
     XubString aStr;
     ImpTakeDescriptionStr(STR_UndoInsertObj,aStr);
@@ -967,7 +954,7 @@ void SdrUndoReplaceObj::SetOldOwner(bool bNew)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-rtl::OUString SdrUndoCopyObj::GetComment() const
+OUString SdrUndoCopyObj::GetComment() const
 {
     XubString aStr;
     ImpTakeDescriptionStr(STR_UndoCopyObj,aStr);
@@ -1031,7 +1018,7 @@ void SdrUndoObjOrdNum::Redo()
     ImpShowPageOfThisObject();
 }
 
-rtl::OUString SdrUndoObjOrdNum::GetComment() const
+OUString SdrUndoObjOrdNum::GetComment() const
 {
     XubString aStr;
     ImpTakeDescriptionStr(STR_UndoObjOrdNum,aStr);
@@ -1114,14 +1101,14 @@ void SdrUndoObjSetText::Redo()
     ImpShowPageOfThisObject();
 }
 
-rtl::OUString SdrUndoObjSetText::GetComment() const
+OUString SdrUndoObjSetText::GetComment() const
 {
     XubString aStr;
     ImpTakeDescriptionStr(STR_UndoObjSetText,aStr);
     return aStr;
 }
 
-XubString SdrUndoObjSetText::GetSdrRepeatComment(SdrView& /*rView*/) const
+OUString SdrUndoObjSetText::GetSdrRepeatComment(SdrView& /*rView*/) const
 {
     XubString aStr;
     ImpTakeDescriptionStr(STR_UndoObjSetText,aStr);
@@ -1233,7 +1220,7 @@ void SdrUndoObjStrAttr::Redo()
     ImpShowPageOfThisObject();
 }
 
-rtl::OUString SdrUndoObjStrAttr::GetComment() const
+OUString SdrUndoObjStrAttr::GetComment() const
 {
     String aStr;
     switch ( meObjStrAttr )
@@ -1299,7 +1286,7 @@ void SdrUndoNewLayer::Redo()
     pLayerAdmin->InsertLayer(pLayer,nNum);
 }
 
-rtl::OUString SdrUndoNewLayer::GetComment() const
+OUString SdrUndoNewLayer::GetComment() const
 {
     return ImpGetResStr(STR_UndoNewLayer);
 }
@@ -1324,7 +1311,7 @@ void SdrUndoDelLayer::Redo()
     DBG_ASSERT(pCmpLayer==pLayer,"SdrUndoDelLayer::Redo(): Removed layer is != pLayer.");
 }
 
-rtl::OUString SdrUndoDelLayer::GetComment() const
+OUString SdrUndoDelLayer::GetComment() const
 {
     return ImpGetResStr(STR_UndoDelLayer);
 }
@@ -1351,7 +1338,7 @@ void SdrUndoMoveLayer::Redo()
     pLayerAdmin->InsertLayer(pLayer,nNeuPos);
 }
 
-rtl::OUString SdrUndoMoveLayer::GetComment() const
+OUString SdrUndoMoveLayer::GetComment() const
 {
     return ImpGetResStr(STR_UndoMovLayer);
 }
@@ -1484,14 +1471,14 @@ void SdrUndoDelPage::Redo()
     bItsMine=sal_True;
 }
 
-rtl::OUString SdrUndoDelPage::GetComment() const
+OUString SdrUndoDelPage::GetComment() const
 {
     XubString aStr;
     ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,sal_False);
     return aStr;
 }
 
-XubString SdrUndoDelPage::GetSdrRepeatComment(SdrView& /*rView*/) const
+OUString SdrUndoDelPage::GetSdrRepeatComment(SdrView& /*rView*/) const
 {
     XubString aStr;
     ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,sal_False);
@@ -1523,7 +1510,7 @@ void SdrUndoNewPage::Redo()
     bItsMine=sal_False;
 }
 
-rtl::OUString SdrUndoNewPage::GetComment() const
+OUString SdrUndoNewPage::GetComment() const
 {
     XubString aStr;
     ImpTakeDescriptionStr(STR_UndoNewPage,aStr,0,sal_False);
@@ -1532,14 +1519,14 @@ rtl::OUString SdrUndoNewPage::GetComment() const
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-rtl::OUString SdrUndoCopyPage::GetComment() const
+OUString SdrUndoCopyPage::GetComment() const
 {
     XubString aStr;
     ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,sal_False);
     return aStr;
 }
 
-XubString SdrUndoCopyPage::GetSdrRepeatComment(SdrView& /*rView*/) const
+OUString SdrUndoCopyPage::GetSdrRepeatComment(SdrView& /*rView*/) const
 {
     XubString aStr;
     ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,sal_False);
@@ -1568,7 +1555,7 @@ void SdrUndoSetPageNum::Redo()
     ImpMovePage(nOldPageNum,nNewPageNum);
 }
 
-rtl::OUString SdrUndoSetPageNum::GetComment() const
+OUString SdrUndoSetPageNum::GetComment() const
 {
     XubString aStr;
     ImpTakeDescriptionStr(STR_UndoMovPage,aStr,0,sal_False);
@@ -1612,7 +1599,7 @@ void SdrUndoPageRemoveMasterPage::Redo()
     mrPage.TRG_ClearMasterPage();
 }
 
-rtl::OUString SdrUndoPageRemoveMasterPage::GetComment() const
+OUString SdrUndoPageRemoveMasterPage::GetComment() const
 {
     XubString aStr;
     ImpTakeDescriptionStr(STR_UndoDelPageMasterDscr,aStr,0,sal_False);
@@ -1657,7 +1644,7 @@ void SdrUndoPageChangeMasterPage::Redo()
     }
 }
 
-rtl::OUString SdrUndoPageChangeMasterPage::GetComment() const
+OUString SdrUndoPageChangeMasterPage::GetComment() const
 {
     XubString aStr;
     ImpTakeDescriptionStr(STR_UndoChgPageMasterDscr,aStr,0,sal_False);