convert TakeObjNameSingul family to OUString

Change-Id: I0c667cbcfcc1ea1f04d113a53b7ba83c943052e4

6 files changed, 54 insertions, 48 deletions

diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index 9f8d8a7cb0f1..5328d243ff0d 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -110,18 +110,19 @@ void E3dCubeObj::SetPosIsCenter(sal_Bool bNew)
 
 // Get the name of the object (singular)
 
-void E3dCubeObj::TakeObjNameSingul(XubString& rName) const
+OUString E3dCubeObj::TakeObjNameSingul() const
 {
-    rName=ImpGetResStr(STR_ObjNameSingulCube3d);
+    OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulCube3d));
 
-    String aName( GetName() );
-    if(aName.Len())
+    OUString aName(GetName());
+    if (!aName.isEmpty())
     {
-        rName += sal_Unicode(' ');
-        rName += sal_Unicode('\'');
-        rName += aName;
-        rName += sal_Unicode('\'');
+        sName.append(' ');
+        sName.append('\'');
+        sName.append(aName);
+        sName.append('\'');
     }
+    return sName.makeStringAndClear();
 }
 
 // Get the name of the object (plural)
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index 724f45d3f8b4..6b4c60708901 100644
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -120,18 +120,19 @@ void E3dExtrudeObj::SetExtrudePolygon(const basegfx::B2DPolyPolygon &rNew)
 
 // Get the name of the object (singular)
 
-void E3dExtrudeObj::TakeObjNameSingul(XubString& rName) const
+OUString E3dExtrudeObj::TakeObjNameSingul() const
 {
-    rName=ImpGetResStr(STR_ObjNameSingulExtrude3d);
+    OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulExtrude3d));
 
-    String aName( GetName() );
-    if(aName.Len())
+    OUString aName(GetName());
+    if (!aName.isEmpty())
     {
-        rName += sal_Unicode(' ');
-        rName += sal_Unicode('\'');
-        rName += aName;
-        rName += sal_Unicode('\'');
+        sName.append(' ');
+        sName.append('\'');
+        sName.append(aName);
+        sName.append('\'');
     }
+    return sName.makeStringAndClear();
 }
 
 // Get the name of the object (plural)
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index d9153bfbe1eb..59005096ed01 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -148,18 +148,19 @@ void E3dLatheObj::SetPolyPoly2D(const basegfx::B2DPolyPolygon& rNew)
 
 // Get the name of the object (singular)
 
-void E3dLatheObj::TakeObjNameSingul(XubString& rName) const
+OUString E3dLatheObj::TakeObjNameSingul() const
 {
-    rName=ImpGetResStr(STR_ObjNameSingulLathe3d);
+    OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulLathe3d));
 
-    String aName( GetName() );
-    if(aName.Len())
+    OUString aName(GetName());
+    if (!aName.isEmpty())
     {
-        rName += sal_Unicode(' ');
-        rName += sal_Unicode('\'');
-        rName += aName;
-        rName += sal_Unicode('\'');
+        sName.append(' ');
+        sName.append('\'');
+        sName.append(aName);
+        sName.append('\'');
     }
+    return sName.makeStringAndClear();
 }
 
 // Get the name of the object (plural)
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 06835cefa6ea..6e74d2f04578 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -664,18 +664,19 @@ basegfx::B3DPolyPolygon E3dObject::CreateWireframe() const
 
 // Get the name of the object (singular)
 
-void E3dObject::TakeObjNameSingul(XubString& rName) const
+OUString E3dObject::TakeObjNameSingul() const
 {
-    rName=ImpGetResStr(STR_ObjNameSingulObj3d);
+    OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulObj3d));
 
-    String aName( GetName() );
-    if(aName.Len())
+    OUString aName(GetName());
+    if (!aName.isEmpty())
     {
-        rName += sal_Unicode(' ');
-        rName += sal_Unicode('\'');
-        rName += aName;
-        rName += sal_Unicode('\'');
+        sName.append(' ');
+        sName.append('\'');
+        sName.append(aName);
+        sName.append('\'');
     }
+    return sName.makeStringAndClear();
 }
 
 // Get the name of the object (plural)
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 059e61f0f85d..cfc41635adf2 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -573,18 +573,19 @@ void E3dScene::RotateScene (const Point& rRef, long /*nWink*/, double sn, double
     NbcMove (Differenz);  // Actually executes the coordinate transformation.
 }
 
-void E3dScene::TakeObjNameSingul(XubString& rName) const
+OUString E3dScene::TakeObjNameSingul() const
 {
-    rName=ImpGetResStr(STR_ObjNameSingulScene3d);
+    OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulScene3d));
 
-    String aName( GetName() );
-    if(aName.Len())
+    OUString aName(GetName());
+    if (!aName.isEmpty())
     {
-        rName += sal_Unicode(' ');
-        rName += sal_Unicode('\'');
-        rName += aName;
-        rName += sal_Unicode('\'');
+        sName.append(' ');
+        sName.append('\'');
+        sName.append(aName);
+        sName.append('\'');
     }
+    return sName.makeStringAndClear();
 }
 
 void E3dScene::TakeObjNamePlural(XubString& rName) const
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index ee831f7471b1..b1c17beb252d 100644
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -127,18 +127,19 @@ void E3dSphereObj::SetSize(const basegfx::B3DVector& rNew)
 
 // Get the name of the object (singular)
 
-void E3dSphereObj::TakeObjNameSingul(XubString& rName) const
+OUString E3dSphereObj::TakeObjNameSingul() const
 {
-    rName=ImpGetResStr(STR_ObjNameSingulSphere3d);
+    OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulSphere3d));
 
-    String aName( GetName() );
-    if(aName.Len())
+    OUString aName(GetName());
+    if (!aName.isEmpty())
     {
-        rName += sal_Unicode(' ');
-        rName += sal_Unicode('\'');
-        rName += aName;
-        rName += sal_Unicode('\'');
+        sName.append(' ');
+        sName.append('\'');
+        sName.append(aName);
+        sName.append('\'');
     }
+    return sName.makeStringAndClear();
 }
 
 // Get the name of the object (plural)