diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-02 15:17:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-05 08:54:22 +0200 |
| commit | 672aee1285638ed2c544c4aa97c01caca95fb103 (patch) | |
| tree | 3045eea69c85767c38e01e8dd7fb25d568b17ed2 /include/svx/svdmrkv.hxx | |
| parent | 5cc8b86f5e79467913787fdad6d02cf1ccd34b32 (diff) | |
convert include/svx/svdmrkv.hxx from String to OUString
Change-Id: I55c26d99c1aec392dc42ebd635914889efcc1786
Diffstat (limited to 'include/svx/svdmrkv.hxx')
| -rw-r--r-- | include/svx/svdmrkv.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index 879d7aa2246a..52bdd8197ef5 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -160,7 +160,7 @@ protected: virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const; virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj,const SdrMarkList * pMarkList) const; sal_Bool ImpIsFrameHandles() const; - void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 nVal=0, sal_uInt16 nOpt=0) const; + void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal=0, sal_uInt16 nOpt=0) const; // Generates a string including degrees symbol, from an angel specification in 1/100deg sal_Bool ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark); @@ -244,9 +244,9 @@ public: sal_uIntPtr GetMarkedObjectCount() const { return GetMarkedObjectList().GetMarkCount(); } void SortMarkedObjects() const { GetMarkedObjectList().ForceSort(); } sal_Bool AreObjectsMarked() const { return (0L != GetMarkedObjectList().GetMarkCount()); } - String GetDescriptionOfMarkedObjects() const { return GetMarkedObjectList().GetMarkDescription(); } - String GetDescriptionOfMarkedPoints() const { return GetMarkedObjectList().GetPointMarkDescription(); } - String GetDescriptionOfMarkedGluePoints() const { return GetMarkedObjectList().GetGluePointMarkDescription(); } + OUString GetDescriptionOfMarkedObjects() const { return GetMarkedObjectList().GetMarkDescription(); } + OUString GetDescriptionOfMarkedPoints() const { return GetMarkedObjectList().GetPointMarkDescription(); } + OUString GetDescriptionOfMarkedGluePoints() const { return GetMarkedObjectList().GetGluePointMarkDescription(); } sal_Bool GetBoundRectFromMarkedObjects(SdrPageView* pPageView, Rectangle& rRect) const { return GetMarkedObjectList().TakeBoundRect(pPageView, rRect); } sal_Bool GetSnapRectFromMarkedObjects(SdrPageView* pPageView, Rectangle& rRect) const { return GetMarkedObjectList().TakeSnapRect(pPageView, rRect); } |