diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-01-31 15:04:51 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-01-31 21:38:57 -0500 |
| commit | 960b61a1bce06f3a3bb59caa5e5757732cc1b9e8 (patch) | |
| tree | 269090478423b17a45e08a5cfa211438a0896dc1 /svx/source | |
| parent | 5f47d3323987ab68f64b2e3a45449820391f09ba (diff) | |
XubString to rtl::OUString.
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/svdraw/svdobj.cxx | 8 | ||||
| -rw-r--r-- | svx/source/svdraw/svdorect.cxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdovirt.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 6d248c2d524b..2b36cc7a722b 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/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(); } //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index 34e8d4e7892c..d684ae31328f 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/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); } diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index f3294debafa3..8bb8190bdd70 100644 --- a/svx/source/svdraw/svdovirt.cxx +++ b/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 } |