convert TakeObjNamePlural family to OUString

Change-Id: I947e47934677a4f9ced0bfc0db3932bcbbb25f36

23 files changed, 23 insertions, 23 deletions

diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx
index fc25aaee534c..942f96c83175 100644
--- a/include/svx/cube3d.hxx
+++ b/include/svx/cube3d.hxx
@@ -80,7 +80,7 @@ public:
 
     // TakeObjName...() is for the display in the UI, for example "3 frames selected".
     virtual OUString TakeObjNameSingul() const;
-    virtual void TakeObjNamePlural(String& rName) const;
+    virtual OUString TakeObjNamePlural() const;
 };
 
 #endif          // _E3D_CUBE3D_HXX
diff --git a/include/svx/extrud3d.hxx b/include/svx/extrud3d.hxx
index d24857be59e2..fc94e8c23b8b 100644
--- a/include/svx/extrud3d.hxx
+++ b/include/svx/extrud3d.hxx
@@ -87,7 +87,7 @@ public:
 
     // TakeObjName...() is for the display in the UI (for example "3 frames selected")
     virtual OUString TakeObjNameSingul() const;
-    virtual void TakeObjNamePlural(String& rName) const;
+    virtual OUString TakeObjNamePlural() const;
 
     // set/get local parameters with geometry regeneration
     void SetExtrudePolygon(const basegfx::B2DPolyPolygon &rNew);
diff --git a/include/svx/lathe3d.hxx b/include/svx/lathe3d.hxx
index fe9c607211b8..e765a2d9776a 100644
--- a/include/svx/lathe3d.hxx
+++ b/include/svx/lathe3d.hxx
@@ -98,7 +98,7 @@ private:
 
     // TakeObjName...() is for the display in the UI, for example "3 frames selected".
     virtual OUString TakeObjNameSingul() const;
-    virtual void TakeObjNamePlural(String& rName) const;
+    virtual OUString TakeObjNamePlural() const;
 
     // set/get local parameters with geometry recreation
     void SetPolyPoly2D(const basegfx::B2DPolyPolygon& rNew);
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index 4628bcdb3998..8195ee3a88a6 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -185,7 +185,7 @@ public:
 
     // TakeObjName...() is for the display in the UI, for example "3 frames selected".
     virtual OUString TakeObjNameSingul() const;
-    virtual void TakeObjNamePlural(String& rName) const;
+    virtual OUString TakeObjNamePlural() const;
     sal_uInt16 GetLogicalGroup() { return 0; }
     virtual E3dObject* Clone() const;
     E3dObject& operator=( const E3dObject& rObj );
diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx
index 04273fee4fd7..2dd0faaffee6 100644
--- a/include/svx/scene3d.hxx
+++ b/include/svx/scene3d.hxx
@@ -215,7 +215,7 @@ public:
 
     // TakeObjName...() is for the display in the UI, for example "3 frames selected".
     virtual OUString TakeObjNameSingul() const;
-    virtual void TakeObjNamePlural(String& rName) const;
+    virtual OUString TakeObjNamePlural() const;
 
     // get transformations
     B3dCamera& GetCameraSet() { return aCameraSet; }
diff --git a/include/svx/sphere3d.hxx b/include/svx/sphere3d.hxx
index c32c0a8d2387..500705f923b8 100644
--- a/include/svx/sphere3d.hxx
+++ b/include/svx/sphere3d.hxx
@@ -69,7 +69,7 @@ public:
 
     // TakeObjName...() is for displaying in the UI, eg "3 selected frames."
     virtual OUString TakeObjNameSingul() const;
-    virtual void TakeObjNamePlural(String& rName) const;
+    virtual OUString TakeObjNamePlural() const;
 };
 
 #endif // _E3D_SPHERE3D_HXX
diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx
index 5733599814a2..1c543454474f 100644
--- a/include/svx/svdoashp.hxx
+++ b/include/svx/svdoashp.hxx
@@ -224,7 +224,7 @@ public:
     SdrObjCustomShape& operator=(const SdrObjCustomShape& rObj);
 
     virtual OUString TakeObjNameSingul() const;
-    virtual void TakeObjNamePlural(String& rName) const;
+    virtual OUString TakeObjNamePlural() const;
 
     virtual basegfx::B2DPolyPolygon TakeCreatePoly( const SdrDragStat& rDrag) const;
 
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 44ced5227c02..8e2b9ce9d2e6 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -624,7 +624,7 @@ public:
 
     // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert".
     virtual OUString TakeObjNameSingul() const;
-    virtual void TakeObjNamePlural(String& rName) const;
+    virtual OUString TakeObjNamePlural() const;
 
     // Das Xor-Polygon wird von der View zu Draggen des Objektes benoetigt.
     // Alle Polygone innerhalb des PolyPolygon werden als PolyLine interpretiert.
diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx
index abd875e4f4ac..315045eb66af 100644
--- a/include/svx/svdocapt.hxx
+++ b/include/svx/svdocapt.hxx
@@ -92,7 +92,7 @@ public:
     void SetFixedTail() { mbFixedTail = sal_True; }
 
     virtual OUString TakeObjNameSingul() const;
-    virtual void TakeObjNamePlural(String& rName) const;
+    virtual OUString TakeObjNamePlural() const;
 
     virtual basegfx::B2DPolyPolygon TakeXorPoly() const;
     virtual void SetModel(SdrModel* pNewModel);
diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx
index dede49257079..6ea0a35fbe06 100644
--- a/include/svx/svdocirc.hxx
+++ b/include/svx/svdocirc.hxx
@@ -99,7 +99,7 @@ public:
     virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const;
 
     virtual OUString TakeObjNameSingul() const;
-    virtual void TakeObjNamePlural(String& rName) const;
+    virtual OUString TakeObjNamePlural() const;
 
     virtual SdrCircObj* Clone() const;
     virtual void RecalcSnapRect();
diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index a5bb981ffed3..a7469beb1bfd 100644
--- a/include/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
@@ -240,7 +240,7 @@ public:
     virtual SdrEdgeObj* Clone() const;
     SdrEdgeObj& operator=(const SdrEdgeObj& rObj);
     virtual OUString TakeObjNameSingul() const;
-    virtual void TakeObjNamePlural(String& rName) const;
+    virtual OUString TakeObjNamePlural() const;
 
     void    SetEdgeTrackPath( const basegfx::B2DPolyPolygon& rPoly );
     basegfx::B2DPolyPolygon GetEdgeTrackPath() const;
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index 64e109a2b510..c97ba69a6f08 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -150,7 +150,7 @@ public:
     virtual sal_uInt16          GetObjIdentifier() const;
 
     virtual OUString        TakeObjNameSingul() const;
-    virtual void            TakeObjNamePlural(String& rName) const;
+    virtual OUString        TakeObjNamePlural() const;
 
     // #i25616#
     virtual basegfx::B2DPolyPolygon TakeXorPoly() const;
diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx
index e25b1698361a..7d35fb2f34f3 100644
--- a/include/svx/svdogrp.hxx
+++ b/include/svx/svdogrp.hxx
@@ -71,7 +71,7 @@ public:
     SdrObjGroup& operator=(const SdrObjGroup& rObj);
 
     virtual OUString TakeObjNameSingul() const;
-    virtual void TakeObjNamePlural(String& rName) const;
+    virtual OUString TakeObjNamePlural() const;
 
     virtual void RecalcSnapRect();
     virtual basegfx::B2DPolyPolygon TakeXorPoly() const;
diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx
index 144292bdd279..a6fcdaa839f3 100644
--- a/include/svx/svdomeas.hxx
+++ b/include/svx/svdomeas.hxx
@@ -96,7 +96,7 @@ public:
     virtual SdrMeasureObj* Clone() const;
 
     virtual OUString TakeObjNameSingul() const;
-    virtual void TakeObjNamePlural(String& rName) const;
+    virtual OUString TakeObjNamePlural() const;
 
     virtual basegfx::B2DPolyPolygon TakeXorPoly() const;
     virtual sal_uInt32 GetHdlCount() const;
diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx
index 163b219c26f1..61fa800faa63 100644
--- a/include/svx/svdomedia.hxx
+++ b/include/svx/svdomedia.hxx
@@ -51,7 +51,7 @@ public:
         virtual sal_uInt16              GetObjIdentifier() const;
 
         virtual OUString            TakeObjNameSingul() const;
-        virtual void                TakeObjNamePlural(String& rName) const;
+        virtual OUString            TakeObjNamePlural() const;
 
         virtual SdrMediaObj*            Clone() const;
         SdrMediaObj&                operator=(const SdrMediaObj& rObj);
diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx
index fea461ed2051..e1ecb9658e26 100644
--- a/include/svx/svdoole2.hxx
+++ b/include/svx/svdoole2.hxx
@@ -142,7 +142,7 @@ public:
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
     virtual sal_uInt16 GetObjIdentifier() const;
     virtual OUString TakeObjNameSingul() const;
-    virtual void TakeObjNamePlural(String& rName) const;
+    virtual OUString TakeObjNamePlural() const;
 
     SdrOle2Obj* Clone() const;
     SdrOle2Obj& operator=(const SdrOle2Obj& rObj);
diff --git a/include/svx/svdopage.hxx b/include/svx/svdopage.hxx
index 39cda1b92610..7c93c6eca5c9 100644
--- a/include/svx/svdopage.hxx
+++ b/include/svx/svdopage.hxx
@@ -60,7 +60,7 @@ public:
     SdrPageObj& operator=(const SdrPageObj& rObj);
 
     virtual OUString TakeObjNameSingul() const;
-    virtual void TakeObjNamePlural(String& rName) const;
+    virtual OUString TakeObjNamePlural() const;
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx
index 610692b3cc80..775cfebd489f 100644
--- a/include/svx/svdopath.hxx
+++ b/include/svx/svdopath.hxx
@@ -95,7 +95,7 @@ public:
     SdrPathObj& operator=(const SdrPathObj& rObj);
 
     virtual OUString TakeObjNameSingul() const;
-    virtual void TakeObjNamePlural(String& rName) const;
+    virtual OUString TakeObjNamePlural() const;
     virtual basegfx::B2DPolyPolygon TakeXorPoly() const;
     virtual void RecalcSnapRect();
     virtual void NbcSetSnapRect(const Rectangle& rRect);
diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx
index 71cc9f15b958..bc3f6b74c85d 100644
--- a/include/svx/svdorect.hxx
+++ b/include/svx/svdorect.hxx
@@ -84,7 +84,7 @@ public:
     virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const;
 
     virtual OUString TakeObjNameSingul() const;
-    virtual void TakeObjNamePlural(String& rName) const;
+    virtual OUString TakeObjNamePlural() const;
 
     virtual SdrRectObj* Clone() const;
     virtual void RecalcSnapRect();
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index 5234bde90302..bff557663649 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -206,7 +206,7 @@ public:
     virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const;
     virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true);
     virtual OUString TakeObjNameSingul() const;
-    virtual void TakeObjNamePlural(String& rName) const;
+    virtual OUString TakeObjNamePlural() const;
     virtual SdrTableObj* Clone() const;
     SdrTableObj& operator=(const SdrTableObj& rObj);
     virtual basegfx::B2DPolyPolygon TakeXorPoly() const;
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 2752be068873..15d9abad7196 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -422,7 +422,7 @@ public:
     // Wird zur Bestimmung des Textankerbereichs benoetigt
     virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const;
     virtual OUString TakeObjNameSingul() const;
-    virtual void TakeObjNamePlural(String& rName) const;
+    virtual OUString TakeObjNamePlural() const;
     virtual SdrTextObj* Clone() const;
     SdrTextObj& operator=(const SdrTextObj& rObj);
     virtual basegfx::B2DPolyPolygon TakeXorPoly() const;
diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx
index d02a05a1bf1f..107ae91b2b1d 100644
--- a/include/svx/svdouno.hxx
+++ b/include/svx/svdouno.hxx
@@ -91,7 +91,7 @@ public:
     virtual SdrObject* getFullDragClone() const;
 
     virtual OUString TakeObjNameSingul() const;
-    virtual void TakeObjNamePlural(XubString& rName) const;
+    virtual OUString TakeObjNamePlural() const;
 
     virtual void SetContextWritingMode( const sal_Int16 _nContextWritingMode );
 
diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx
index d3e62f4a5581..94b5bae802f8 100644
--- a/include/svx/svdovirt.hxx
+++ b/include/svx/svdovirt.hxx
@@ -73,7 +73,7 @@ public:
     SdrVirtObj& operator=(const SdrVirtObj& rObj);
 
     virtual OUString TakeObjNameSingul() const;
-    virtual void TakeObjNamePlural(String& rName) const;
+    virtual OUString TakeObjNamePlural() const;
 
     virtual basegfx::B2DPolyPolygon TakeXorPoly() const;
     virtual sal_uInt32 GetHdlCount() const;