convert TakeObjNameSingul family to OUString

Change-Id: I0c667cbcfcc1ea1f04d113a53b7ba83c943052e4

23 files changed, 23 insertions, 23 deletions

diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx
index 5d65cc5ad8ea..fc25aaee534c 100644
--- a/include/svx/cube3d.hxx
+++ b/include/svx/cube3d.hxx
@@ -79,7 +79,7 @@ public:
     sal_uInt16 GetSideFlags() { return nSideFlags; }
 
     // TakeObjName...() is for the display in the UI, for example "3 frames selected".
-    virtual void TakeObjNameSingul(String& rName) const;
+    virtual OUString TakeObjNameSingul() const;
     virtual void TakeObjNamePlural(String& rName) const;
 };
 
diff --git a/include/svx/extrud3d.hxx b/include/svx/extrud3d.hxx
index 60da90841abb..d24857be59e2 100644
--- a/include/svx/extrud3d.hxx
+++ b/include/svx/extrud3d.hxx
@@ -86,7 +86,7 @@ public:
     virtual E3dExtrudeObj* Clone() const;
 
     // TakeObjName...() is for the display in the UI (for example "3 frames selected")
-    virtual void TakeObjNameSingul(String& rName) const;
+    virtual OUString TakeObjNameSingul() const;
     virtual void TakeObjNamePlural(String& rName) const;
 
     // set/get local parameters with geometry regeneration
diff --git a/include/svx/lathe3d.hxx b/include/svx/lathe3d.hxx
index c43c4265bb2c..fe9c607211b8 100644
--- a/include/svx/lathe3d.hxx
+++ b/include/svx/lathe3d.hxx
@@ -97,7 +97,7 @@ private:
     virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const;
 
     // TakeObjName...() is for the display in the UI, for example "3 frames selected".
-    virtual void TakeObjNameSingul(String& rName) const;
+    virtual OUString TakeObjNameSingul() const;
     virtual void TakeObjNamePlural(String& rName) const;
 
     // set/get local parameters with geometry recreation
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index 1074fbccb256..4628bcdb3998 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -184,7 +184,7 @@ public:
     basegfx::B3DPolyPolygon CreateWireframe() const;
 
     // TakeObjName...() is for the display in the UI, for example "3 frames selected".
-    virtual void TakeObjNameSingul(String& rName) const;
+    virtual OUString TakeObjNameSingul() const;
     virtual void TakeObjNamePlural(String& rName) const;
     sal_uInt16 GetLogicalGroup() { return 0; }
     virtual E3dObject* Clone() const;
diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx
index c2e9f7776b83..04273fee4fd7 100644
--- a/include/svx/scene3d.hxx
+++ b/include/svx/scene3d.hxx
@@ -214,7 +214,7 @@ public:
     void RotateScene(const Point& rRef, long nWink, double sn, double cs);
 
     // TakeObjName...() is for the display in the UI, for example "3 frames selected".
-    virtual void TakeObjNameSingul(String& rName) const;
+    virtual OUString TakeObjNameSingul() const;
     virtual void TakeObjNamePlural(String& rName) const;
 
     // get transformations
diff --git a/include/svx/sphere3d.hxx b/include/svx/sphere3d.hxx
index a36216c5dc71..c32c0a8d2387 100644
--- a/include/svx/sphere3d.hxx
+++ b/include/svx/sphere3d.hxx
@@ -68,7 +68,7 @@ public:
     void SetSize(const basegfx::B3DVector& rNew);
 
     // TakeObjName...() is for displaying in the UI, eg "3 selected frames."
-    virtual void TakeObjNameSingul(String& rName) const;
+    virtual OUString TakeObjNameSingul() const;
     virtual void TakeObjNamePlural(String& rName) const;
 };
 
diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx
index 91890dc1300d..5733599814a2 100644
--- a/include/svx/svdoashp.hxx
+++ b/include/svx/svdoashp.hxx
@@ -223,7 +223,7 @@ public:
     virtual SdrObjCustomShape* Clone() const;
     SdrObjCustomShape& operator=(const SdrObjCustomShape& rObj);
 
-    virtual void TakeObjNameSingul(String& rName) const;
+    virtual OUString TakeObjNameSingul() const;
     virtual void TakeObjNamePlural(String& rName) const;
 
     virtual basegfx::B2DPolyPolygon TakeCreatePoly( const SdrDragStat& rDrag) const;
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 7885c8a273b8..44ced5227c02 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -623,7 +623,7 @@ public:
     SdrObject& operator=(const SdrObject& rObj);
 
     // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert".
-    virtual void TakeObjNameSingul(String& rName) const;
+    virtual OUString TakeObjNameSingul() const;
     virtual void TakeObjNamePlural(String& rName) const;
 
     // Das Xor-Polygon wird von der View zu Draggen des Objektes benoetigt.
diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx
index 54c67fb849f3..abd875e4f4ac 100644
--- a/include/svx/svdocapt.hxx
+++ b/include/svx/svdocapt.hxx
@@ -91,7 +91,7 @@ public:
     // for calc: fixed note tail position.
     void SetFixedTail() { mbFixedTail = sal_True; }
 
-    virtual void TakeObjNameSingul(String& rName) const;
+    virtual OUString TakeObjNameSingul() const;
     virtual void TakeObjNamePlural(String& rName) const;
 
     virtual basegfx::B2DPolyPolygon TakeXorPoly() const;
diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx
index d613327b309b..dede49257079 100644
--- a/include/svx/svdocirc.hxx
+++ b/include/svx/svdocirc.hxx
@@ -98,7 +98,7 @@ public:
     virtual sal_uInt16 GetObjIdentifier() const;
     virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const;
 
-    virtual void TakeObjNameSingul(String& rName) const;
+    virtual OUString TakeObjNameSingul() const;
     virtual void TakeObjNamePlural(String& rName) const;
 
     virtual SdrCircObj* Clone() const;
diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index ea0968cd9487..a5bb981ffed3 100644
--- a/include/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
@@ -239,7 +239,7 @@ public:
     virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const;
     virtual SdrEdgeObj* Clone() const;
     SdrEdgeObj& operator=(const SdrEdgeObj& rObj);
-    virtual void TakeObjNameSingul(String& rName) const;
+    virtual OUString TakeObjNameSingul() const;
     virtual void TakeObjNamePlural(String& rName) const;
 
     void    SetEdgeTrackPath( const basegfx::B2DPolyPolygon& rPoly );
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index 036a83e6144a..64e109a2b510 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -149,7 +149,7 @@ public:
     virtual void            TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
     virtual sal_uInt16          GetObjIdentifier() const;
 
-    virtual void            TakeObjNameSingul(String& rName) const;
+    virtual OUString        TakeObjNameSingul() const;
     virtual void            TakeObjNamePlural(String& rName) const;
 
     // #i25616#
diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx
index d12f3809ae86..e25b1698361a 100644
--- a/include/svx/svdogrp.hxx
+++ b/include/svx/svdogrp.hxx
@@ -70,7 +70,7 @@ public:
     virtual SdrObjGroup* Clone() const;
     SdrObjGroup& operator=(const SdrObjGroup& rObj);
 
-    virtual void TakeObjNameSingul(String& rName) const;
+    virtual OUString TakeObjNameSingul() const;
     virtual void TakeObjNamePlural(String& rName) const;
 
     virtual void RecalcSnapRect();
diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx
index ad3e7370f781..144292bdd279 100644
--- a/include/svx/svdomeas.hxx
+++ b/include/svx/svdomeas.hxx
@@ -95,7 +95,7 @@ public:
     virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const;
     virtual SdrMeasureObj* Clone() const;
 
-    virtual void TakeObjNameSingul(String& rName) const;
+    virtual OUString TakeObjNameSingul() const;
     virtual void TakeObjNamePlural(String& rName) const;
 
     virtual basegfx::B2DPolyPolygon TakeXorPoly() const;
diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx
index 48a29cb029f7..163b219c26f1 100644
--- a/include/svx/svdomedia.hxx
+++ b/include/svx/svdomedia.hxx
@@ -50,7 +50,7 @@ public:
         virtual void                TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
         virtual sal_uInt16              GetObjIdentifier() const;
 
-        virtual void                TakeObjNameSingul(String& rName) const;
+        virtual OUString            TakeObjNameSingul() const;
         virtual void                TakeObjNamePlural(String& rName) const;
 
         virtual SdrMediaObj*            Clone() const;
diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx
index 92b4ad55476d..fea461ed2051 100644
--- a/include/svx/svdoole2.hxx
+++ b/include/svx/svdoole2.hxx
@@ -141,7 +141,7 @@ public:
 
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
     virtual sal_uInt16 GetObjIdentifier() const;
-    virtual void TakeObjNameSingul(String& rName) const;
+    virtual OUString TakeObjNameSingul() const;
     virtual void TakeObjNamePlural(String& rName) const;
 
     SdrOle2Obj* Clone() const;
diff --git a/include/svx/svdopage.hxx b/include/svx/svdopage.hxx
index 2109dfbf9e54..39cda1b92610 100644
--- a/include/svx/svdopage.hxx
+++ b/include/svx/svdopage.hxx
@@ -59,7 +59,7 @@ public:
     virtual SdrPageObj* Clone() const;
     SdrPageObj& operator=(const SdrPageObj& rObj);
 
-    virtual void TakeObjNameSingul(String& rName) const;
+    virtual OUString TakeObjNameSingul() const;
     virtual void TakeObjNamePlural(String& rName) const;
 };
 
diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx
index 61f3c90720a8..610692b3cc80 100644
--- a/include/svx/svdopath.hxx
+++ b/include/svx/svdopath.hxx
@@ -94,7 +94,7 @@ public:
     virtual SdrPathObj* Clone() const;
     SdrPathObj& operator=(const SdrPathObj& rObj);
 
-    virtual void TakeObjNameSingul(String& rName) const;
+    virtual OUString TakeObjNameSingul() const;
     virtual void TakeObjNamePlural(String& rName) const;
     virtual basegfx::B2DPolyPolygon TakeXorPoly() const;
     virtual void RecalcSnapRect();
diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx
index f984bb2c68ad..71cc9f15b958 100644
--- a/include/svx/svdorect.hxx
+++ b/include/svx/svdorect.hxx
@@ -83,7 +83,7 @@ public:
     virtual sal_uInt16 GetObjIdentifier() const;
     virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const;
 
-    virtual void TakeObjNameSingul(String& rName) const;
+    virtual OUString TakeObjNameSingul() const;
     virtual void TakeObjNamePlural(String& rName) const;
 
     virtual SdrRectObj* Clone() const;
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index f14b72502d18..5234bde90302 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -205,7 +205,7 @@ public:
 
     virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const;
     virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true);
-    virtual void TakeObjNameSingul(String& rName) const;
+    virtual OUString TakeObjNameSingul() const;
     virtual void TakeObjNamePlural(String& rName) const;
     virtual SdrTableObj* Clone() const;
     SdrTableObj& operator=(const SdrTableObj& rObj);
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 36bf4a4819e9..2752be068873 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -421,7 +421,7 @@ public:
 
     // Wird zur Bestimmung des Textankerbereichs benoetigt
     virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const;
-    virtual void TakeObjNameSingul(String& rName) const;
+    virtual OUString TakeObjNameSingul() const;
     virtual void TakeObjNamePlural(String& rName) const;
     virtual SdrTextObj* Clone() const;
     SdrTextObj& operator=(const SdrTextObj& rObj);
diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx
index 243bcce4f61d..d02a05a1bf1f 100644
--- a/include/svx/svdouno.hxx
+++ b/include/svx/svdouno.hxx
@@ -90,7 +90,7 @@ public:
     virtual bool supportsFullDrag() const;
     virtual SdrObject* getFullDragClone() const;
 
-    virtual void TakeObjNameSingul(XubString& rName) const;
+    virtual OUString TakeObjNameSingul() const;
     virtual void TakeObjNamePlural(XubString& rName) const;
 
     virtual void SetContextWritingMode( const sal_Int16 _nContextWritingMode );
diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx
index e7493f55ac90..d3e62f4a5581 100644
--- a/include/svx/svdovirt.hxx
+++ b/include/svx/svdovirt.hxx
@@ -72,7 +72,7 @@ public:
     virtual SdrVirtObj* Clone() const;
     SdrVirtObj& operator=(const SdrVirtObj& rObj);
 
-    virtual void TakeObjNameSingul(String& rName) const;
+    virtual OUString TakeObjNameSingul() const;
     virtual void TakeObjNamePlural(String& rName) const;
 
     virtual basegfx::B2DPolyPolygon TakeXorPoly() const;