convert sc/source/ui/inc/i*.hxx from String to OUString

Change-Id: I856c9b2a286da2fd41e88ec14c0a77bc3546b0c4

2 files changed, 13 insertions, 13 deletions

diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index f4b9674b43f3..339545468d2c 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -729,7 +729,7 @@ void ScCsvGrid::ImplSetTextLineSep(
     rStrVec.clear();
 
     // scan for separators
-    String aCellText;
+    OUString aCellText;
     const sal_Unicode* pSepChars = rSepChars.getStr();
     const sal_Unicode* pChar = rTextLine.getStr();
     sal_uInt32 nColIx = 0;
@@ -744,7 +744,7 @@ void ScCsvGrid::ImplSetTextLineSep(
         /* TODO: signal overflow somewhere in UI */
 
         // update column width
-        sal_Int32 nWidth = std::max( CSV_MINCOLWIDTH, aCellText.Len() + sal_Int32( 1 ) );
+        sal_Int32 nWidth = std::max( CSV_MINCOLWIDTH, aCellText.getLength() + 1 );
         if( IsValidColumn( nColIx ) )
         {
             // expand existing column
@@ -768,10 +768,10 @@ void ScCsvGrid::ImplSetTextLineSep(
             ImplInsertSplit( nLastPos );
         }
 
-        if( aCellText.Len() <= CSV_MAXSTRLEN )
+        if( aCellText.getLength() <= CSV_MAXSTRLEN )
             rStrVec.push_back( aCellText );
         else
-            rStrVec.push_back( aCellText.Copy( 0, CSV_MAXSTRLEN ) );
+            rStrVec.push_back( aCellText.copy( 0, CSV_MAXSTRLEN ) );
         ++nColIx;
     }
     InvalidateGfx();
diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx
index 73eb197b8d8f..f588c161ba02 100644
--- a/sc/source/ui/dbgui/imoptdlg.cxx
+++ b/sc/source/ui/dbgui/imoptdlg.cxx
@@ -31,7 +31,7 @@ static const sal_Char pStrFix[] = "FIX";
 //  darum ab Version 336 Komma stattdessen
 
 
-ScImportOptions::ScImportOptions( const String& rStr )
+ScImportOptions::ScImportOptions( const OUString& rStr )
 {
     // Use the same string format as ScAsciiOptions,
     // because the import options string is passed here when a CSV file is loaded and saved again.
@@ -48,37 +48,37 @@ ScImportOptions::ScImportOptions( const String& rStr )
     if ( nTokenCount >= 3 )
     {
         // first 3 tokens: common
-        OUString aToken( rStr.GetToken( 0, ',' ) );
+        OUString aToken( rStr.getToken( 0, ',' ) );
         if( aToken.equalsIgnoreAsciiCase( pStrFix ) )
             bFixedWidth = sal_True;
         else
             nFieldSepCode = ScAsciiOptions::GetWeightedFieldSep( aToken, true);
-        nTextSepCode  = (sal_Unicode) rStr.GetToken(1,',').ToInt32();
-        aStrFont      = rStr.GetToken(2,',');
+        nTextSepCode  = (sal_Unicode) rStr.getToken(1,',').toInt32();
+        aStrFont      = rStr.getToken(2,',');
         eCharSet      = ScGlobal::GetCharsetValue(aStrFont);
 
         if ( nTokenCount == 4 )
         {
             // compatibility with old options string: "Save as shown" as 4th token, numeric
-            bSaveAsShown = (rStr.GetToken( 3, ',' ).ToInt32() ? sal_True : false);
+            bSaveAsShown = (rStr.getToken( 3, ',' ).toInt32() ? sal_True : false);
             bQuoteAllText = sal_True;   // use old default then
         }
         else
         {
             // look at the same positions as in ScAsciiOptions
             if ( nTokenCount >= 7 )
-                bQuoteAllText = rStr.GetToken(6, ',').EqualsAscii("true");
+                bQuoteAllText = rStr.getToken(6, ',').equalsAscii("true");
             if ( nTokenCount >= 9 )
-                bSaveAsShown = rStr.GetToken(8, ',').EqualsAscii("true");
+                bSaveAsShown = rStr.getToken(8, ',').equalsAscii("true");
             if ( nTokenCount >= 10 )
-                bSaveFormulas = rStr.GetToken(9, ',').EqualsAscii("true");
+                bSaveFormulas = rStr.getToken(9, ',').equalsAscii("true");
         }
     }
 }
 
 //------------------------------------------------------------------------
 
-String ScImportOptions::BuildString() const
+OUString ScImportOptions::BuildString() const
 {
     OUString aResult;