XubString to rtl::OUString.

svx/inc/svx/svdobj.hxx

@@ -230,7 +230,7 @@ public:
     virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const;
     virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const;
     virtual bool DoMacro (const SdrObjMacroHitRec& rRec, SdrObject* pObj);
-    virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const;
+    virtual rtl::OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const;
 };
 
 //************************************************************
@@ -855,7 +855,7 @@ public:
     virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const;
     virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const;
     virtual bool DoMacro (const SdrObjMacroHitRec& rRec);
-    virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const;
+    virtual rtl::OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const;
     bool IsMacroHit(const SdrObjMacroHitRec& rRec) const { return CheckMacroHit(rRec)!=NULL; }
 
     // Konnektoren. (siehe auch Dokumentation in SvdoEdge.HXX, SdrEdgeObj

svx/inc/svx/svdorect.hxx

@@ -120,7 +120,7 @@ public:
     virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear);
 
     virtual bool DoMacro(const SdrObjMacroHitRec& rRec);
-    virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const;
+    virtual rtl::OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const;
 
     virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const;
     virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const;

svx/inc/svx/svdovirt.hxx

@@ -152,7 +152,7 @@ public:
     virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const;
     virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const;
     virtual bool DoMacro (const SdrObjMacroHitRec& rRec);
-    virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const;
+    virtual rtl::OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const;
 
     // OD 30.06.2003 #108784# - virtual <GetOffset()> returns Point(0,0)
     // #i73248# for default SdrVirtObj, offset is aAnchor, not (0,0)

svx/source/svdraw/svdobj.cxx

@@ -219,9 +219,9 @@ bool SdrObjUserData::DoMacro(const SdrObjMacroHitRec& /*rRec*/, SdrObject* /*pOb
     return false;
 }
 
-XubString SdrObjUserData::GetMacroPopupComment(const SdrObjMacroHitRec& /*rRec*/, const SdrObject* /*pObj*/) const
+rtl::OUString SdrObjUserData::GetMacroPopupComment(const SdrObjMacroHitRec& /*rRec*/, const SdrObject* /*pObj*/) const
 {
-    return String();
+    return rtl::OUString();
 }
 
 SdrObjUserDataList::SdrObjUserDataList() {}
@@ -1850,13 +1850,13 @@ bool SdrObject::DoMacro(const SdrObjMacroHitRec& rRec)
     return false;
 }
 
-XubString SdrObject::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const
+rtl::OUString SdrObject::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const
 {
     SdrObjUserData* pData=ImpGetMacroUserData();
     if (pData!=NULL) {
         return pData->GetMacroPopupComment(rRec,this);
     }
-    return String();
+    return rtl::OUString();
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////

svx/source/svdraw/svdorect.cxx

@@ -518,7 +518,7 @@ bool SdrRectObj::DoMacro(const SdrObjMacroHitRec& rRec)
     return SdrTextObj::DoMacro(rRec);
 }
 
-XubString SdrRectObj::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const
+rtl::OUString SdrRectObj::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const
 {
     return SdrTextObj::GetMacroPopupComment(rRec);
 }

svx/source/svdraw/svdovirt.cxx

@@ -633,7 +633,7 @@ bool SdrVirtObj::DoMacro(const SdrObjMacroHitRec& rRec)
     return rRefObj.DoMacro(rRec); // TODO: positioning offset
 }
 
-XubString SdrVirtObj::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const
+rtl::OUString SdrVirtObj::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const
 {
     return rRefObj.GetMacroPopupComment(rRec); // TODO: positioning offset
 }