XubString to rtl::OUString.

7 files changed, 72 insertions, 66 deletions

diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx
index 59fbf176b142..1885382bc303 100644
--- a/svx/inc/svx/svdmodel.hxx
+++ b/svx/inc/svx/svdmodel.hxx
@@ -419,8 +419,8 @@ public:
     bool             IsUIOnlyKomma() const                      { return bUIOnlyKomma; }
 
     static void      TakeUnitStr(FieldUnit eUnit, String& rStr);
-    void             TakeMetricStr(long nVal, String& rStr, bool bNoUnitChars = false, sal_Int32 nNumDigits = -1) const;
-    void             TakeWinkStr(long nWink, String& rStr, bool bNoDegChar = false) const;
+    void             TakeMetricStr(long nVal, rtl::OUString& rStr, bool bNoUnitChars = false, sal_Int32 nNumDigits = -1) const;
+    void             TakeWinkStr(long nWink, rtl::OUString& rStr, bool bNoDegChar = false) const;
     void             TakePercentStr(const Fraction& rVal, String& rStr, bool bNoPercentChar = false) const;
 
     // RecalcPageNums wird idR. nur von der Page gerufen.
diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx
index 1508e3be4040..30b8385d717a 100644
--- a/svx/inc/svx/svdobj.hxx
+++ b/svx/inc/svx/svdobj.hxx
@@ -482,8 +482,8 @@ protected:
 
     void ImpForcePlusData();
 
-    String GetWinkStr(long nWink, bool bNoDegChar = false) const;
-    String GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, bool bNoUnitChars = false) const;
+    rtl::OUString GetWinkStr(long nWink, bool bNoDegChar = false) const;
+    rtl::OUString GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, bool bNoUnitChars = false) const;
 
     // bNotMyself=true bedeutet: Nur die ObjList auf Dirty setzen, nicht mich.
     // Wird z.B. benoetigt fuer NbcMove, denn da movt man SnapRect und aOutRect
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 29b21f129d11..84de9bf7903a 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -1411,15 +1411,15 @@ SdrDragMove::SdrDragMove(SdrDragView& rNewView)
 
 void SdrDragMove::TakeSdrDragComment(XubString& rStr) const
 {
-    XubString aStr;
+    rtl::OUString aStr;
 
     ImpTakeDescriptionStr(STR_DragMethMove, rStr);
     rStr.AppendAscii(" (x=");
     getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDX(), aStr);
-    rStr += aStr;
+    rStr.Append(aStr);
     rStr.AppendAscii(" y=");
     getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDY(), aStr);
-    rStr += aStr;
+    rStr.Append(aStr);
     rStr += sal_Unicode(')');
 
     if(getSdrDragView().IsDragWithCopy())
@@ -2015,7 +2015,6 @@ void SdrDragRotate::TakeSdrDragComment(XubString& rStr) const
 {
     ImpTakeDescriptionStr(STR_DragMethRotate, rStr);
     rStr.AppendAscii(" (");
-    XubString aStr;
     sal_Int32 nTmpWink(NormAngle360(nWink));
 
     if(bRight && nWink)
@@ -2023,8 +2022,9 @@ void SdrDragRotate::TakeSdrDragComment(XubString& rStr) const
         nTmpWink -= 36000;
     }
 
+    rtl::OUString aStr;
     getSdrDragView().GetModel()->TakeWinkStr(nTmpWink, aStr);
-    rStr += aStr;
+    rStr.Append(aStr);
     rStr += sal_Unicode(')');
 
     if(getSdrDragView().IsDragWithCopy())
@@ -2159,10 +2159,9 @@ void SdrDragShear::TakeSdrDragComment(XubString& rStr) const
 
     nTmpWink = NormAngle180(nTmpWink);
 
-    XubString aStr;
-
+    rtl::OUString aStr;
     getSdrDragView().GetModel()->TakeWinkStr(nTmpWink, aStr);
-    rStr += aStr;
+    rStr.Append(aStr);
     rStr += sal_Unicode(')');
 
     if(getSdrDragView().IsDragWithCopy())
@@ -2742,15 +2741,15 @@ void SdrDragCrook::TakeSdrDragComment(XubString& rStr) const
     {
         rStr.AppendAscii(" (");
 
-        XubString aStr;
         sal_Int32 nVal(nWink);
 
         if(bAtCenter)
             nVal *= 2;
 
         nVal = Abs(nVal);
+        rtl::OUString aStr;
         getSdrDragView().GetModel()->TakeWinkStr(nVal, aStr);
-        rStr += aStr;
+        rStr.Append(aStr);
         rStr += sal_Unicode(')');
     }
 
@@ -3399,14 +3398,14 @@ void SdrDragDistort::TakeSdrDragComment(XubString& rStr) const
 {
     ImpTakeDescriptionStr(STR_DragMethDistort, rStr);
 
-    XubString aStr;
+    rtl::OUString aStr;
 
     rStr.AppendAscii(" (x=");
     getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDX(), aStr);
-    rStr += aStr;
+    rStr.Append(aStr);
     rStr.AppendAscii(" y=");
     getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDY(), aStr);
-    rStr += aStr;
+    rStr.Append(aStr);
     rStr += sal_Unicode(')');
 
     if(getSdrDragView().IsDragWithCopy())
@@ -3554,14 +3553,14 @@ void SdrDragCrop::TakeSdrDragComment(XubString& rStr) const
 {
     ImpTakeDescriptionStr(STR_DragMethCrop, rStr);
 
-    XubString aStr;
+    rtl::OUString aStr;
 
     rStr.AppendAscii(" (x=");
     getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDX(), aStr);
-    rStr += aStr;
+    rStr.Append(aStr);
     rStr.AppendAscii(" y=");
     getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDY(), aStr);
-    rStr += aStr;
+    rStr.Append(aStr);
     rStr += sal_Unicode(')');
 
     if(getSdrDragView().IsDragWithCopy())
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 079162b63029..27ac271bfa0e 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1233,7 +1233,7 @@ void SdrModel::TakeUnitStr(FieldUnit eUnit, XubString& rStr)
     }
 }
 
-void SdrModel::TakeMetricStr(long nVal, XubString& rStr, bool bNoUnitChars, sal_Int32 nNumDigits) const
+void SdrModel::TakeMetricStr(long nVal, rtl::OUString& rStr, bool bNoUnitChars, sal_Int32 nNumDigits) const
 {
     // #i22167#
     // change to double precision usage to not lose decimal places
@@ -1271,7 +1271,8 @@ void SdrModel::TakeMetricStr(long nVal, XubString& rStr, bool bNoUnitChars, sal_
         nKomma = nNumDigits;
     }
 
-    rStr = UniString::CreateFromInt32(static_cast<sal_Int32>(fLocalValue + 0.5));
+    rtl::OUStringBuffer aBuf;
+    aBuf.append(static_cast<sal_Int32>(fLocalValue + 0.5));
 
     if(nKomma < 0)
     {
@@ -1279,40 +1280,42 @@ void SdrModel::TakeMetricStr(long nVal, XubString& rStr, bool bNoUnitChars, sal_
         sal_Int32 nAnz(-nKomma);
 
         for(sal_Int32 i=0; i<nAnz; i++)
-            rStr += sal_Unicode('0');
+            aBuf.append(sal_Unicode('0'));
 
         nKomma = 0;
     }
 
     // the second condition needs to be <= since inside this loop
     // also the leading zero is inserted.
-    if(nKomma > 0 && rStr.Len() <= nKomma)
+    if (nKomma > 0 && aBuf.getLength() <= nKomma)
     {
         // if necessary, add zeros before the decimal point
-        sal_Int32 nAnz(nKomma - rStr.Len());
+        sal_Int32 nAnz = nKomma - aBuf.getLength();
 
         if(nAnz >= 0 && rLoc.isNumLeadingZero())
             nAnz++;
 
         for(sal_Int32 i=0; i<nAnz; i++)
-            rStr.Insert(sal_Unicode('0'), 0);
+            aBuf.insert(0, sal_Unicode('0'));
     }
 
     sal_Unicode cDec( rLoc.getNumDecimalSep().GetChar(0) );
 
     // insert KommaChar (decimal point character)
-    sal_Int32 nVorKomma(rStr.Len() - nKomma);
+    sal_Int32 nVorKomma = aBuf.getLength() - nKomma;
 
     if(nKomma > 0)
-        rStr.Insert(cDec, (xub_StrLen) nVorKomma);
+        aBuf.insert(nVorKomma, cDec);
 
     if(!rLoc.isNumTrailingZeros())
     {
-        while(rStr.Len() && rStr.GetChar(rStr.Len() - 1) == sal_Unicode('0'))
-            rStr.Erase(rStr.Len() - 1);
+        // Remove all trailing zeros.
+        while (aBuf.getLength() && aBuf[aBuf.getLength()-1] == sal_Unicode('0'))
+            aBuf.remove(aBuf.getLength()-1, 1);
 
-        if(rStr.Len() && rStr.GetChar(rStr.Len() - 1) == cDec)
-            rStr.Erase(rStr.Len() - 1);
+        // Remove decimal if it's the last character.
+        if (aBuf.getLength() && aBuf[aBuf.getLength()-1] == cDec)
+            aBuf.remove(aBuf.getLength()-1, 1);
     }
 
     // if necessary, add separators before every third digit
@@ -1326,53 +1329,55 @@ void SdrModel::TakeMetricStr(long nVal, XubString& rStr, bool bNoUnitChars, sal_
 
             while(i > 0)
             {
-                rStr.Insert(cTho, (xub_StrLen)i);
+                aBuf.insert(i, cTho);
                 i -= 3;
             }
         }
     }
 
-    if(!rStr.Len())
-    {
-        rStr = String();
-        rStr += sal_Unicode('0');
-    }
+    if (!aBuf.getLength())
+        aBuf.append(sal_Unicode('0'));
 
     if(bNegative)
     {
-        rStr.Insert(sal_Unicode('-'), 0);
+        aBuf.insert(0, sal_Unicode('-'));
     }
 
     if(!bNoUnitChars)
-        rStr += aUIUnitStr;
+        aBuf.append(aUIUnitStr);
+
+    rStr = aBuf.makeStringAndClear();
 }
 
-void SdrModel::TakeWinkStr(long nWink, XubString& rStr, bool bNoDegChar) const
+void SdrModel::TakeWinkStr(long nWink, rtl::OUString& rStr, bool bNoDegChar) const
 {
-    sal_Bool bNeg(nWink < 0);
+    bool bNeg = nWink < 0;
 
     if(bNeg)
         nWink = -nWink;
 
-    rStr = UniString::CreateFromInt32(nWink);
+    rtl::OUStringBuffer aBuf;
+    aBuf.append(static_cast<sal_Int32>(nWink));
 
     SvtSysLocale aSysLoc;
     const LocaleDataWrapper& rLoc = aSysLoc.GetLocaleData();
-    xub_StrLen nAnz(2);
+    sal_Int32 nAnz = 2;
 
     if(rLoc.isNumLeadingZero())
         nAnz++;
 
-    while(rStr.Len() < nAnz)
-        rStr.Insert(sal_Unicode('0'), 0);
+    while(aBuf.getLength() < nAnz)
+        aBuf.insert(0, sal_Unicode('0'));
 
-    rStr.Insert(rLoc.getNumDecimalSep().GetChar(0), rStr.Len() - 2);
+    aBuf.insert(aBuf.getLength()-2, rLoc.getNumDecimalSep().GetChar(0));
 
     if(bNeg)
-        rStr.Insert(sal_Unicode('-'), 0);
+        aBuf.insert(0, sal_Unicode('-'));
 
     if(!bNoDegChar)
-        rStr += DEGREE_CHAR;
+        aBuf.append(DEGREE_CHAR);
+
+    rStr = aBuf.makeStringAndClear();
 }
 
 void SdrModel::TakePercentStr(const Fraction& rVal, XubString& rStr, bool bNoPercentChar) const
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 58cc0c8acceb..f5dd2b70b303 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1129,18 +1129,18 @@ void SdrObject::ImpForcePlusData()
         pPlusData = NewPlusData();
 }
 
-XubString SdrObject::GetWinkStr(long nWink, bool bNoDegChar) const
+rtl::OUString SdrObject::GetWinkStr(long nWink, bool bNoDegChar) const
 {
-    XubString aStr;
+    rtl::OUString aStr;
     if (pModel!=NULL) {
         pModel->TakeWinkStr(nWink,aStr,bNoDegChar);
     }
     return aStr;
 }
 
-XubString SdrObject::GetMetrStr(long nVal, MapUnit /*eWantMap*/, bool bNoUnitChars) const
+rtl::OUString SdrObject::GetMetrStr(long nVal, MapUnit /*eWantMap*/, bool bNoUnitChars) const
 {
-    XubString aStr;
+    rtl::OUString aStr;
     if (pModel!=NULL) {
         pModel->TakeMetricStr(nVal,aStr,bNoUnitChars);
     }
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 42ffe6327f64..6535b11c1b02 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -120,7 +120,9 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMe
                     nLen = BigMulDiv(nLen, aFact.GetNumerator(), aFact.GetDenominator());
                 }
 
-                pModel->TakeMetricStr(nLen, rStr, sal_True, nNumDigits);
+                rtl::OUString aTmp;
+                pModel->TakeMetricStr(nLen, aTmp, true, nNumDigits);
+                rStr = aTmp;
 
                 if(!aFact.IsValid())
                 {
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 2fca8bca3a2e..867eab9bea98 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -954,36 +954,36 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
         aNow -= aPrev;
         aStr.AppendAscii(" (");
 
-        XubString aMetr;
+        rtl::OUString aMetr;
 
         if(pU->bCircle)
         {
             mrSdrPathObject.GetModel()->TakeWinkStr(Abs(pU->nCircRelWink), aMetr);
-            aStr += aMetr;
+            aStr.Append(aMetr);
             aStr.AppendAscii(" r=");
             mrSdrPathObject.GetModel()->TakeMetricStr(pU->nCircRadius, aMetr, sal_True);
-            aStr += aMetr;
+            aStr.Append(aMetr);
         }
 
         aStr.AppendAscii("dx=");
         mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X(), aMetr, sal_True);
-        aStr += aMetr;
+        aStr.Append(aMetr);
 
         aStr.AppendAscii(" dy=");
         mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y(), aMetr, sal_True);
-        aStr += aMetr;
+        aStr.Append(aMetr);
 
         if(!IsFreeHand(meObjectKind))
         {
             sal_Int32 nLen(GetLen(aNow));
             aStr.AppendAscii("  l=");
             mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True);
-            aStr += aMetr;
+            aStr.Append(aMetr);
 
             sal_Int32 nWink(GetAngle(aNow));
             aStr += sal_Unicode(' ');
             mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr);
-            aStr += aMetr;
+            aStr.Append(aMetr);
         }
 
         aStr += sal_Unicode(')');
@@ -1029,18 +1029,18 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
         // dx=0.00 dy=0.00                -- both sides bezier
         // dx=0.00 dy=0.00  l=0.00 0.00°  -- one bezier/lever on one side, a start, or an ending
         // dx=0.00 dy=0.00  l=0.00 0.00° / l=0.00 0.00° -- in between
-        XubString aMetr;
+        rtl::OUString aMetr;
         Point aBeg(rDrag.GetStart());
         Point aNow(rDrag.GetNow());
 
         aStr = String();
         aStr.AppendAscii("dx=");
         mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X() - aBeg.X(), aMetr, sal_True);
-        aStr += aMetr;
+        aStr.Append(aMetr);
 
         aStr.AppendAscii(" dy=");
         mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y() - aBeg.Y(), aMetr, sal_True);
-        aStr += aMetr;
+        aStr.Append(aMetr);
 
         if(!pDragData->IsMultiPointDrag())
         {
@@ -1067,12 +1067,12 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
                 sal_Int32 nLen(GetLen(aNow));
                 aStr.AppendAscii("  l=");
                 mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True);
-                aStr += aMetr;
+                aStr.Append(aMetr);
 
                 sal_Int32 nWink(GetAngle(aNow));
                 aStr += sal_Unicode(' ');
                 mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr);
-                aStr += aMetr;
+                aStr.Append(aMetr);
             }
             else if(nPntAnz > 1)
             {