fdo#38838: Converting String/UniString to OUString

Change-Id: If64db96005fcd8a42e4fa24041867b99183965f9
Reviewed-on: https://gerrit.libreoffice.org/2586
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

11 files changed, 22 insertions, 22 deletions

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 74a496e3cbbb..b4850ca1cfb4 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -3395,7 +3395,7 @@ void ScCompiler::AutoCorrectParsedSymbol()
             if ( nRefs > 2 )
             {   // duplicated or too many ':'? B:2::C10 => B2:C10
                 bColons = true;
-                xub_StrLen nIndex = 0;
+                sal_Int32 nIndex = 0;
                 String aTmp1( aSymbol.GetToken( 0, ':', nIndex ) );
                 xub_StrLen nLen1 = aTmp1.Len();
                 String aSym, aTmp2;
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 9a7b96e5e5e9..1ff94415f3f2 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -1558,7 +1558,7 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) :
                         Excel uses the NUL character as string list separator. */
                     mxString1.reset( new XclExpString( EXC_STR_8BITLENGTH ) );
                     xub_StrLen nTokenCnt = comphelper::string::getTokenCount(aString, '\n');
-                    xub_StrLen nStringIx = 0;
+                    sal_Int32 nStringIx = 0;
                     for( xub_StrLen nToken = 0; nToken < nTokenCnt; ++nToken )
                     {
                         String aToken( aString.GetToken( 0, '\n', nStringIx ) );
@@ -1798,7 +1798,7 @@ XclExpWebQuery::XclExpWebQuery(
     // comma separated list of HTML table names or indexes
     xub_StrLen nTokenCnt = comphelper::string::getTokenCount(rSource, ';');
     String aNewTables, aAppendTable;
-    xub_StrLen nStringIx = 0;
+    sal_Int32 nStringIx = 0;
     bool bExitLoop = false;
     for( xub_StrLen nToken = 0; (nToken < nTokenCnt) && !bExitLoop; ++nToken )
     {
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index a96b263a4582..5c11ee546687 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -747,7 +747,7 @@ void XclTokenArrayHelper::ConvertStringToList( ScTokenArray& rScTokArr, sal_Unic
     {
         rScTokArr.Clear();
         xub_StrLen nTokenCnt = comphelper::string::getTokenCount(aString, cStringSep);
-        xub_StrLen nStringIx = 0;
+        sal_Int32 nStringIx = 0;
         for( xub_StrLen nToken = 0; nToken < nTokenCnt; ++nToken )
         {
             String aToken( aString.GetToken( 0, cStringSep, nStringIx ) );
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index fbadc83613cc..e7c74b8a6c08 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -385,7 +385,7 @@ void ScHTMLExport::WriteHeader()
     {   // Fontliste, VCL: Semikolon als Separator,
         // CSS1: Komma als Separator und jeder einzelne Fontname quoted
         const String& rList = aHTMLStyle.aFontFamilyName;
-        for ( xub_StrLen j = 0, nPos = 0; j < nFonts; j++ )
+        for ( sal_Int32 j = 0, nPos = 0; j < (sal_Int32) nFonts; j++ )
         {
             rStrm << '\"';
             OUT_STR( rList.GetToken( 0, ';', nPos ) );
@@ -1109,7 +1109,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
             else
             {   // Fontliste, VCL: Semikolon als Separator, HTML: Komma
                 const String& rList = rFontItem.GetFamilyName();
-                for ( xub_StrLen j = 0, nPos = 0; j < nFonts; j++ )
+                for ( sal_Int32 j = 0, nPos = 0; j < (sal_Int32)nFonts; j++ )
                 {
                     rtl::OString aTmpStr = HTMLOutFuncs::ConvertStringToHTML(
                         rList.GetToken( 0, ';', nPos ), eDestEnc,
diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx
index 98ff6f15610f..e833a8e4baf7 100644
--- a/sc/source/filter/html/htmlimp.cxx
+++ b/sc/source/filter/html/htmlimp.cxx
@@ -212,7 +212,7 @@ String ScHTMLImport::GetHTMLRangeNameList( ScDocument* pDoc, const String& rOrig
     ScRangeName* pRangeNames = pDoc->GetRangeName();
     ScRangeList aRangeList;
     xub_StrLen nTokenCnt = comphelper::string::getTokenCount(rOrigName, ';');
-    xub_StrLen nStringIx = 0;
+    sal_Int32 nStringIx = 0;
     for( xub_StrLen nToken = 0; nToken < nTokenCnt; nToken++ )
     {
         String aToken( rOrigName.GetToken( 0, ';', nStringIx ) );
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 717c1833324e..a0274f99fc29 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -1555,8 +1555,8 @@ void ScHTMLLayoutParser::FontOn( ImportInfo* pInfo )
                 {
                     const String& rFace = rOption.GetString();
                     String aFontName;
-                    xub_StrLen nPos = 0;
-                    while( nPos != STRING_NOTFOUND )
+                    sal_Int32 nPos = 0;
+                    while( nPos != -1 )
                     {
                         // Fontliste, VCL: Semikolon als Separator, HTML: Komma
                         String aFName = rFace.GetToken( 0, ',', nPos );
@@ -3068,8 +3068,8 @@ void ScHTMLQueryParser::FontOn( const ImportInfo& rInfo )
             {
                 const String& rFace = itr->GetString();
                 String aFontName;
-                xub_StrLen nPos = 0;
-                while( nPos != STRING_NOTFOUND )
+                sal_Int32 nPos = 0;
+                while( nPos != -1 )
                 {
                     // font list separator: VCL = ';' HTML = ','
                     String aFName = comphelper::string::strip(rFace.GetToken(0, ',', nPos), ' ');
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index 6da66eb86d05..74eaac258739 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -1072,10 +1072,10 @@ void ScCsvGrid::ImplDrawCellText( const Point& rPos, const String& rText )
         U+0020 may be drawn with a wrong width (from non-fixed-width Asian or
         Complex font). Now we draw every non-space portion separately. */
     xub_StrLen nTokenCount = comphelper::string::getTokenCount(aPlainText, ' ');
-    xub_StrLen nCharIx = 0;
+    sal_Int32 nCharIx = 0;
     for( xub_StrLen nToken = 0; nToken < nTokenCount; ++nToken )
     {
-        xub_StrLen nBeginIx = nCharIx;
+        sal_Int32 nBeginIx = nCharIx;
         String aToken = aPlainText.GetToken( 0, ' ', nCharIx );
         if( aToken.Len() > 0 )
         {
@@ -1086,7 +1086,7 @@ void ScCsvGrid::ImplDrawCellText( const Point& rPos, const String& rText )
     }
 
     nCharIx = 0;
-    while( (nCharIx = rText.Search( '\t', nCharIx )) != STRING_NOTFOUND )
+    while( (nCharIx = rText.Search( '\t', nCharIx )) != -1 )
     {
         sal_Int32 nX1 = rPos.X() + GetCharWidth() * nCharIx;
         sal_Int32 nX2 = nX1 + GetCharWidth() - 2;
@@ -1099,7 +1099,7 @@ void ScCsvGrid::ImplDrawCellText( const Point& rPos, const String& rText )
         ++nCharIx;
     }
     nCharIx = 0;
-    while( (nCharIx = rText.Search( '\n', nCharIx )) != STRING_NOTFOUND )
+    while( (nCharIx = rText.Search( '\n', nCharIx )) != -1 )
     {
         sal_Int32 nX1 = rPos.X() + GetCharWidth() * nCharIx;
         sal_Int32 nX2 = nX1 + GetCharWidth() - 2;
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 23f6a60f8fdb..f6ad414259eb 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -254,7 +254,7 @@ void lclGetFormulaFromStringList( String& rFmlaStr, const String& rStringList, s
 {
     rFmlaStr.Erase();
     xub_StrLen nTokenCnt = comphelper::string::getTokenCount(rStringList, '\n');
-    for( xub_StrLen nToken = 0, nStringIx = 0; nToken < nTokenCnt; ++nToken )
+    for( sal_Int32 nToken = 0, nStringIx = 0; nToken < (sal_Int32) nTokenCnt; ++nToken )
     {
         String aToken( rStringList.GetToken( 0, '\n', nStringIx ) );
         ScGlobal::AddQuotes( aToken, '"' );
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index 9ae886126c69..260801e160ca 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -278,7 +278,7 @@ sal_Bool ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
     SCCOL nWidth = 0;
     SCROW nHeight = 0;
     xub_StrLen nTokenCnt = comphelper::string::getTokenCount(aTempArea, ';');
-    xub_StrLen nStringIx = 0;
+    sal_Int32 nStringIx = 0;
     xub_StrLen nToken;
 
     for( nToken = 0; nToken < nTokenCnt; nToken++ )
diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx
index e277e96981b1..47aeac7ef63a 100644
--- a/sc/source/ui/view/hintwin.cxx
+++ b/sc/source/ui/view/hintwin.cxx
@@ -46,8 +46,8 @@ ScHintWindow::ScHintWindow( Window* pParent, const String& rTit, const String& r
     SetFont( aTextFont );
 
     Size aTextSize;
-    xub_StrLen nIndex = 0;
-    while ( nIndex != STRING_NOTFOUND )
+    sal_Int32 nIndex = 0;
+    while ( nIndex != -1 )
     {
         String aLine = aMessage.GetToken( 0, CHAR_CR, nIndex );
         Size aLineSize( GetTextWidth( aLine ), GetTextHeight() );
@@ -78,9 +78,9 @@ void ScHintWindow::Paint( const Rectangle& /* rRect */ )
     DrawText( Point(HINT_MARGIN,HINT_MARGIN), aTitle );
 
     SetFont( aTextFont );
-    xub_StrLen nIndex = 0;
+    sal_Int32 nIndex = 0;
     Point aLineStart = aTextStart;
-    while ( nIndex != STRING_NOTFOUND )
+    while ( nIndex != -1 )
     {
         String aLine = aMessage.GetToken( 0, CHAR_CR, nIndex );
         DrawText( aLineStart, aLine );
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index a8537b66268d..42b4fb416e72 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -937,7 +937,7 @@ void ScPreviewShell::ReadUserData(const String& rData, sal_Bool /* bBrowse */)
     xub_StrLen nCount = comphelper::string::getTokenCount(rData, ';');
     if (nCount)
     {
-        xub_StrLen nIndex = 0;
+        sal_Int32 nIndex = 0;
         pPreview->SetZoom((sal_uInt16)rData.GetToken( 0, SC_USERDATA_SEP, nIndex ).ToInt32());
         pPreview->SetPageNo(rData.GetToken( 0, SC_USERDATA_SEP, nIndex ).ToInt32());
         eZoom = SVX_ZOOM_PERCENT;