convert TakeObjNameSingul family to OUString

Change-Id: I0c667cbcfcc1ea1f04d113a53b7ba83c943052e4

1 files changed, 13 insertions, 9 deletions

diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 37cc3f9c24c3..98d7ca30c307 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -291,26 +291,30 @@ SdrObjGroup& SdrObjGroup::operator=(const SdrObjGroup& rObj)
 }
 
 
-void SdrObjGroup::TakeObjNameSingul(XubString& rName) const
+OUString SdrObjGroup::TakeObjNameSingul() const
 {
+    OUStringBuffer sName;
+
     if(!pSub->GetObjCount())
     {
-        rName = ImpGetResStr(STR_ObjNameSingulGRUPEMPTY);
+        sName.append(ImpGetResStr(STR_ObjNameSingulGRUPEMPTY));
     }
     else
     {
-        rName = ImpGetResStr(STR_ObjNameSingulGRUP);
+        sName.append(ImpGetResStr(STR_ObjNameSingulGRUP));
     }
 
-    const String aName(GetName());
+    const OUString aName(GetName());
 
-    if(aName.Len())
+    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();
 }