trivial empty-init String::Fill -> comphelper::padToLength

Change-Id: I6c41b8f4d3ad739eff545063bd1f8fe8f4fba65e

2 files changed, 31 insertions, 29 deletions

diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx
index 015cf9711c8f..8687ae9db8ea 100644
--- a/svl/inc/svl/zformat.hxx
+++ b/svl/inc/svl/zformat.hxx
@@ -648,13 +648,12 @@ private:
     }
 
     // transliterate according to NativeNumber
-    SVL_DLLPRIVATE void ImpTransliterateImpl( String& rStr, const SvNumberNatNum& rNum ) const;
+    SVL_DLLPRIVATE OUString impTransliterateImpl(const OUString& rStr, const SvNumberNatNum& rNum) const;
 
-    void ImpTransliterate( String& rStr, const SvNumberNatNum& rNum ) const
-        {
-            if ( rNum.IsComplete() )
-                ImpTransliterateImpl( rStr, rNum );
-        }
+    OUString impTransliterate(const OUString& rStr, const SvNumberNatNum& rNum) const
+    {
+        return rNum.IsComplete() ? impTransliterateImpl(rStr, rNum) : rStr;
+    }
 
 #endif // _ZFORMAT_CXX
 
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index b57db8aa994f..8846707ea0f8 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -1973,7 +1973,7 @@ void SvNumberformat::ImpGetOutputStdToPrecision(double& rNumber, String& rOutStr
         comphelper::string::getTokenCount(rOutString, '0') == rOutString.Len())
         rOutString = comphelper::string::stripStart(rOutString, '-');            // nicht -0
 
-    ImpTransliterate( rOutString, NumFor[0].GetNatNum() );
+    rOutString = impTransliterate(rOutString, NumFor[0].GetNatNum());
 }
 
 void SvNumberformat::ImpGetOutputInputLine(double fNumber, String& OutString)
@@ -2564,7 +2564,7 @@ bool SvNumberformat::GetOutputString(double fNumber,
                     char aBuf[100];
                     sprintf( aBuf, "%.f", fNum );   // simple rounded integer (#100211# - checked)
                     sStr.AssignAscii( aBuf );
-                    ImpTransliterate( sStr, NumFor[nIx].GetNatNum() );
+                    sStr = impTransliterate(sStr, NumFor[nIx].GetNatNum());
                 }
                 if (rInfo.nCntPre > 0 && nFrac == 0)
                 {
@@ -2779,11 +2779,11 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
         if (aBuf.getLength() < rInfo.nCntPost)
             padToLength(aBuf, rInfo.nCntPost, '0');
         sSecStr = aBuf.makeStringAndClear();
-        ImpTransliterate( sSecStr, NumFor[nIx].GetNatNum() );
+        sSecStr = impTransliterate(sSecStr, NumFor[nIx].GetNatNum());
         nCntPost = sSecStr.Len();
     }
     else
-        ImpTransliterate( sSecStr, NumFor[nIx].GetNatNum() );
+        sSecStr = impTransliterate(sSecStr, NumFor[nIx].GetNatNum());
 
     xub_StrLen nSecPos = 0;                 // Zum Ziffernweisen
                                             // abarbeiten
@@ -3374,13 +3374,14 @@ bool SvNumberformat::ImpGetDateOutput(double fNumber,
                         CalendarDisplayCode::LONG_YEAR, nNatNum );
                 if (aYear.Len() < 4)
                 {
+                    using namespace comphelper::string;
                     // Ensure that year consists of at least 4 digits, so it
                     // can be distinguished from 2 digits display and edited
                     // without suddenly being hit by the 2-digit year magic.
-                    String aZero;
-                    aZero.Fill( 4 - aYear.Len(), sal_Unicode('0'));
-                    ImpTransliterate( aZero, NumFor[nIx].GetNatNum());
-                    aYear.Insert( aZero, 0);
+                    OUStringBuffer aBuf;
+                    padToLength(aBuf, 4 - aYear.Len(), sal_Unicode('0'));
+                    OUString aZero = impTransliterate(aBuf.makeStringAndClear(), NumFor[nIx].GetNatNum());
+                    aYear.Insert(aZero, 0);
                 }
                 OutString += aYear;
                 if ( bOtherCalendar )
@@ -3498,11 +3499,11 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber,
         if (aBuf.getLength() < rInfo.nCntPost)
             padToLength(aBuf, rInfo.nCntPost, '0');
         sSecStr = aBuf.makeStringAndClear();
-        ImpTransliterate( sSecStr, NumFor[nIx].GetNatNum() );
+        sSecStr = impTransliterate(sSecStr, NumFor[nIx].GetNatNum());
         nCntPost = sSecStr.Len();
     }
     else
-        ImpTransliterate( sSecStr, NumFor[nIx].GetNatNum() );
+        sSecStr = impTransliterate(sSecStr, NumFor[nIx].GetNatNum());
 
     xub_StrLen nSecPos = 0;                     // Zum Ziffernweisen
                                             // abarbeiten
@@ -3710,13 +3711,14 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber,
                         CalendarDisplayCode::LONG_YEAR, nNatNum );
                 if (aYear.Len() < 4)
                 {
+                    using namespace comphelper::string;
                     // Ensure that year consists of at least 4 digits, so it
                     // can be distinguished from 2 digits display and edited
                     // without suddenly being hit by the 2-digit year magic.
-                    String aZero;
-                    aZero.Fill( 4 - aYear.Len(), sal_Unicode('0'));
-                    ImpTransliterate( aZero, NumFor[nIx].GetNatNum());
-                    aYear.Insert( aZero, 0);
+                    OUStringBuffer aBuf;
+                    padToLength(aBuf, 4 - aYear.Len(), sal_Unicode('0'));
+                    OUString aZero = impTransliterate(aBuf.makeStringAndClear(), NumFor[nIx].GetNatNum());
+                    aYear.Insert(aZero, 0);
                 }
                 OutString += aYear;
                 if ( bOtherCalendar )
@@ -3963,8 +3965,7 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber,
     }
     if (bSign)
         sStr.Insert('-',0);
-    ImpTransliterate( sStr, NumFor[nIx].GetNatNum() );
-    OutString = sStr;
+    OutString = impTransliterate(sStr, NumFor[nIx].GetNatNum());
     return bRes;
 }
 
@@ -4727,7 +4728,7 @@ OUString SvNumberformat::GetMappedFormatstring(
 String SvNumberformat::ImpGetNatNumString( const SvNumberNatNum& rNum,
         sal_Int32 nVal, sal_uInt16 nMinDigits ) const
 {
-    String aStr;
+    OUString aStr;
     if ( nMinDigits )
     {
         if ( nMinDigits == 2 )
@@ -4749,23 +4750,25 @@ String SvNumberformat::ImpGetNatNumString( const SvNumberNatNum& rNum,
                 aStr = aValStr;
             else
             {
-                aStr.Fill( nMinDigits - aValStr.Len(), '0' );
-                aStr += aValStr;
+                using namespace comphelper::string;
+                OUStringBuffer aBuf;
+                padToLength(aBuf, nMinDigits - aValStr.Len(), '0' );
+                aBuf.append(aValStr);
+                aStr = aBuf.makeStringAndClear();
             }
         }
     }
     else
         aStr = rtl::OUString::valueOf( nVal );
-    ImpTransliterate( aStr, rNum );
-    return aStr;
+    return impTransliterate(aStr, rNum);
 }
 
-void SvNumberformat::ImpTransliterateImpl( String& rStr,
+OUString SvNumberformat::impTransliterateImpl(const OUString& rStr,
         const SvNumberNatNum& rNum ) const
 {
     com::sun::star::lang::Locale aLocale(
             MsLangId::convertLanguageToLocale( rNum.GetLang() ) );
-    rStr = GetFormatter().GetNatNum()->getNativeNumberString( rStr,
+    return GetFormatter().GetNatNum()->getNativeNumberString( rStr,
             aLocale, rNum.GetNatNum() );
 }