OUStrings: constify and avoid temporaries

Change-Id: I9d75924b414f21dacad2d72908c1e4e3af291672

1 files changed, 7 insertions, 15 deletions

diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index b411e935c88e..8380f0cf8e40 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -216,24 +216,16 @@ SdrUndoObj::SdrUndoObj(SdrObject& rNewObj)
 
 OUString SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, bool bRepeat )
 {
-    OUString rStr = ImpGetResStr(nStrCacheID);
+    const OUString rStr {ImpGetResStr(nStrCacheID)};
 
-    sal_Int32 nPos = rStr.indexOf("%1");
+    const sal_Int32 nPos = rStr.indexOf("%1");
+    if (nPos < 0)
+        return rStr;
 
-    if(nPos != -1)
-    {
-        if(bRepeat)
-        {
-            rStr = rStr.replaceAt(nPos, 2, ImpGetResStr(STR_ObjNameSingulPlural));
-        }
-        else
-        {
-            OUString aStr(_rForObject.TakeObjNameSingul());
-            rStr = rStr.replaceAt(nPos, 2, aStr);
-        }
-    }
+    if (bRepeat)
+        return rStr.replaceAt(nPos, 2, ImpGetResStr(STR_ObjNameSingulPlural));
 
-    return rStr;
+    return rStr.replaceAt(nPos, 2, _rForObject.TakeObjNameSingul());
 }
 
 void SdrUndoObj::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, bool bRepeat) const