remove legacy String svl's Put*Entry family of function and convert users

Change-Id: Iebf4017ce4c2c48389716eac1bbf7f386ac7a296

5 files changed, 16 insertions, 15 deletions

diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 655594ca8cfc..5b3354aeb307 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1340,10 +1340,10 @@ String GetNumberFormatCode(XclRoot& rRoot, const sal_uInt16 nScNumFmt, SvNumberF
             LanguageType eLang = pEntry->GetLanguage();
             if( eLang != LANGUAGE_ENGLISH_US )
             {
-                xub_StrLen nCheckPos;
+                sal_Int32 nCheckPos;
                 short nType = NUMBERFORMAT_DEFINED;
                 sal_uInt32 nKey;
-                String aTemp( pEntry->GetFormatstring() );
+                OUString aTemp( pEntry->GetFormatstring() );
                 xFormatter->PutandConvertEntry( aTemp, nCheckPos, nType, nKey, eLang, LANGUAGE_ENGLISH_US );
                 OSL_ENSURE( nCheckPos == 0, "XclExpNumFmtBuffer::WriteFormatRecord - format code not convertible" );
                 pEntry = xFormatter->GetEntry( nKey );
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index 760cf4ad878b..dd24da424aee 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -659,14 +659,14 @@ void XclImpNumFmtBuffer::CreateScFormats()
         const XclNumFmt& rNumFmt = aIt->second;
 
         // insert/convert the Excel number format
-        xub_StrLen nCheckPos;
+        sal_Int32 nCheckPos;
         short nType = NUMBERFORMAT_DEFINED;
         sal_uInt32 nKey;
         if( rNumFmt.maFormat.Len() )
         {
-            String aFormat( rNumFmt.maFormat );
+            OUString aFormat( rNumFmt.maFormat );
             rFormatter.PutandConvertEntry( aFormat, nCheckPos,
-                nType, nKey, LANGUAGE_ENGLISH_US, rNumFmt.meLanguage );
+                                           nType, nKey, LANGUAGE_ENGLISH_US, rNumFmt.meLanguage );
         }
         else
             nKey = rFormatter.GetFormatIndex( rNumFmt.meOffset, rNumFmt.meLanguage );
diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index b1b3b2da5b89..96f4e605e4a9 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -203,7 +203,7 @@ SfxUInt32Item* FormCache::NewAttr( sal_uInt8 nFormat, sal_uInt8 nSt )
     // neues Format erzeugen
     sal_uInt8       nL, nH; // Low-/High-Nibble
     sal_uInt8       nForm = nFormat;
-    String          aFormString;
+    OUString          aFormString;
     sal_Int16       eType = NUMBERFORMAT_ALL;
     sal_uInt32      nIndex1;
     sal_uInt32      nHandle;
@@ -373,7 +373,7 @@ SfxUInt32Item* FormCache::NewAttr( sal_uInt8 nFormat, sal_uInt8 nSt )
         nHandle = pFormTable->GetFormatIndex( eIndexTableOffset, eLanguage);
     else
     {
-        xub_StrLen  nDummy;
+        sal_Int32  nDummy;
         pFormTable->PutEntry( aFormString, nDummy, eType, nHandle, eLanguage );
     }
 
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index f93c2554163a..efbeeb356e72 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -282,13 +282,13 @@ static void lcl_setScalesToColumns(ScDocument& rDoc, const vector<long>& rScales
         pOldEntry->GetFormatSpecialInfo(bThousand, bNegRed, nPrecision, nLeading);
 
         nPrecision = static_cast<sal_uInt16>(rScales[i]);
-        String aNewPicture = pFormatter->GenerateFormat(nOldFormat, eLang,
-                                   bThousand, bNegRed, nPrecision, nLeading);
+        OUString aNewPicture = pFormatter->GenerateFormat(nOldFormat, eLang,
+                                                          bThousand, bNegRed, nPrecision, nLeading);
 
         sal_uInt32 nNewFormat = pFormatter->GetEntryKey(aNewPicture, eLang);
         if (nNewFormat == NUMBERFORMAT_ENTRY_NOT_FOUND)
         {
-            xub_StrLen nErrPos = 0;
+            sal_Int32 nErrPos = 0;
             short nNewType = 0;
             bool bOk = pFormatter->PutEntry(
                 aNewPicture, nErrPos, nNewType, nNewFormat, eLang);
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index f695475ac17e..cd3e2f539608 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -2614,8 +2614,8 @@ void ScViewFunc::SetNumFmtByStr( const String& rCode )
     {
         //  enter new
 
-        String      aFormat = rCode;    // will be changed
-        xub_StrLen  nErrPos = 0;
+        OUString    aFormat = rCode;    // will be changed
+        sal_Int32   nErrPos = 0;
         short       nType   = 0;        //! ???
         bOk = pFormatter->PutEntry( aFormat, nErrPos, nType, nNumberFormat, eLanguage );
     }
@@ -2724,13 +2724,14 @@ void ScViewFunc::ChangeNumFmtDecimals( sal_Bool bIncrement )
 
     if (!bError)
     {
-        String aNewPicture = pFormatter->GenerateFormat(nOldFormat, eLanguage,
-                                    bThousand, bNegRed, nPrecision, nLeading);
+        OUString aNewPicture = pFormatter->GenerateFormat(nOldFormat, eLanguage,
+                                                          bThousand, bNegRed,
+                                                          nPrecision, nLeading);
 
         nNewFormat = pFormatter->GetEntryKey( aNewPicture, eLanguage );
         if ( nNewFormat == NUMBERFORMAT_ENTRY_NOT_FOUND )
         {
-            xub_StrLen nErrPos = 0;
+            sal_Int32 nErrPos = 0;
             short nNewType = 0;
             sal_Bool bOk = pFormatter->PutEntry( aNewPicture, nErrPos,
                                                 nNewType, nNewFormat, eLanguage );