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>

4 files changed, 22 insertions, 22 deletions

diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 8e7084522367..31f6d89dca34 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -633,7 +633,7 @@ namespace sw
 
         bool IsStarSymbol(const rtl::OUString &rFontName)
         {
-            xub_StrLen nIndex = 0;
+            sal_Int32 nIndex = 0;
             rtl::OUString sFamilyNm(GetNextFontToken(rFontName, nIndex));
             return (sFamilyNm.equalsIgnoreAsciiCase("starsymbol") ||
                 sFamilyNm.equalsIgnoreAsciiCase("opensymbol"));
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index b4afcffff739..f5e1f530c31f 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -453,10 +453,10 @@ namespace sw
 
         FontMapExport::FontMapExport(const String &rFamilyName)
         {
-            xub_StrLen nIndex = 0;
+            sal_Int32 nIndex = 0;
             msPrimary = GetNextFontToken(rFamilyName, nIndex);
             msSecondary = myImplHelpers::FindBestMSSubstituteFont(msPrimary);
-            if (!msSecondary.Len() && nIndex != STRING_NOTFOUND)
+            if (!msSecondary.Len() && nIndex != -1)
                 msSecondary = GetNextFontToken(rFamilyName, nIndex);
         }
 
@@ -735,14 +735,14 @@ namespace sw
             SwapQuotesInField(rParams);
 
             // Force to Japanese when finding one of 'geaE'
-            rtl::OUString sJChars( "geE" );
+            OUString sJChars( "geE" );
             bool bForceJapanese = ( STRING_NOTFOUND != rParams.SearchChar( sJChars.getStr() ) );
             if ( bForceJapanese )
             {
-                rParams.SearchAndReplaceAll( rtl::OUString( "ee" ),
-                                             rtl::OUString( "yyyy" ) );
-                rParams.SearchAndReplaceAll( rtl::OUString( "EE" ),
-                                             rtl::OUString( "YYYY" ) );
+                rParams.SearchAndReplaceAll( OUString( "ee" ),
+                                             OUString( "yyyy" ) );
+                rParams.SearchAndReplaceAll( OUString( "EE" ),
+                                             OUString( "YYYY" ) );
             }
             if (LANGUAGE_FRENCH != nDocLang)
             {
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index baeb447a65d8..4f9161fd7685 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2194,8 +2194,8 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
                         const String& rStyles = pTOX->GetStyleNames( n );
                         if( rStyles.Len() )
                         {
-                            xub_StrLen nPos = 0;
-                            String sLvl = rtl::OUString(',');
+                            sal_Int32 nPos = 0;
+                            String sLvl = OUString(',');
                             sLvl += OUString::number( n + 1 );
                             do {
                                 String sStyle( rStyles.GetToken( 0,
@@ -2210,7 +2210,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
                                         ( sTOption += sStyle ) += sLvl;
                                     }
                                 }
-                            } while( STRING_NOTFOUND != nPos );
+                            } while( -1 != nPos );
                         }
                     }
 
@@ -2382,7 +2382,7 @@ void WW8Export::WritePostItBegin( ww::bytes* pOut )
 
 String FieldString(ww::eField eIndex)
 {
-    String sRet(rtl::OUString("  "));
+    String sRet(OUString("  "));
     if (const char *pField = ww::GetEnglishFieldName(eIndex))
         sRet.InsertAscii(pField, 1);
     return sRet;
@@ -2653,7 +2653,7 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
                 case DI_CUSTOM:
                     eFld = ww::eDOCPROPERTY;
                     {
-                        rtl::OUString sQuotes('\"');
+                        OUString sQuotes('\"');
                         const SwDocInfoField * pDocInfoField =
                         dynamic_cast<const SwDocInfoField *> (pFld);
 
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 0760c96021fa..97a6641b2c31 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -282,9 +282,9 @@ bool WW8ReadFieldParams::GetTokenSttFromTo(sal_uInt16* pFrom, sal_uInt16* pTo, s
 
         String sParams( GetResult() );
 
-        xub_StrLen nIndex = 0;
+        sal_Int32 nIndex = 0;
         String sStart( sParams.GetToken(0, '-', nIndex) );
-        if( STRING_NOTFOUND != nIndex )
+        if( -1 != nIndex )
         {
             nStart = static_cast<sal_uInt16>(sStart.ToInt32());
             nEnd   = static_cast<sal_uInt16>(sParams.Copy(nIndex).ToInt32());
@@ -2824,17 +2824,17 @@ static void lcl_toxMatchTSwitch(SwWW8ImplReader& rReader, SwTOXBase& rBase,
         String sParams( rParam.GetResult() );
         if( sParams.Len() )
         {
-            xub_StrLen nIndex = 0;
+            sal_Int32 nIndex = 0;
 
             // Delimiters between styles and style levels appears to allow both ; and ,
 
             String sTemplate( sParams.GetToken(0, ';', nIndex) );
-            if( STRING_NOTFOUND == nIndex )
+            if( -1 == nIndex )
             {
                 nIndex=0;
                 sTemplate = sParams.GetToken(0, ',', nIndex);
             }
-            if( STRING_NOTFOUND == nIndex )
+            if( -1 == nIndex )
             {
                 const SwFmt* pStyle = rReader.GetStyleWithOrgWWName(sTemplate);
                 if( pStyle )
@@ -2842,12 +2842,12 @@ static void lcl_toxMatchTSwitch(SwWW8ImplReader& rReader, SwTOXBase& rBase,
                 // Store Style for Level 0 into TOXBase
                 rBase.SetStyleNames( sTemplate, 0 );
             }
-            else while( STRING_NOTFOUND != nIndex )
+            else while( -1 != nIndex )
             {
-                xub_StrLen nOldIndex=nIndex;
+                sal_Int32 nOldIndex=nIndex;
                 sal_uInt16 nLevel = static_cast<sal_uInt16>(
                     sParams.GetToken(0, ';', nIndex).ToInt32());
-                if( STRING_NOTFOUND == nIndex )
+                if( -1 == nIndex )
                 {
                     nIndex = nOldIndex;
                     nLevel = static_cast<sal_uInt16>(
@@ -2873,7 +2873,7 @@ static void lcl_toxMatchTSwitch(SwWW8ImplReader& rReader, SwTOXBase& rBase,
                 // read next style name...
                 nOldIndex = nIndex;
                 sTemplate = sParams.GetToken(0, ';', nIndex);
-                if( STRING_NOTFOUND == nIndex )
+                if( -1 == nIndex )
                 {
                     nIndex=nOldIndex;
                     sTemplate = sParams.GetToken(0, ',', nIndex);