ditch String::CreateFromAscii

Change-Id: I2b482bd323ac510629c5ee31868010b7cd6ce691

4 files changed, 69 insertions, 69 deletions

diff --git a/lotuswordpro/source/filter/lwpnumericfmt.cxx b/lotuswordpro/source/filter/lwpnumericfmt.cxx
index ea025d9ebe31..8c22e0bc2af2 100644
--- a/lotuswordpro/source/filter/lwpnumericfmt.cxx
+++ b/lotuswordpro/source/filter/lwpnumericfmt.cxx
@@ -304,14 +304,14 @@ void LwpNumericFormat::GetCurrencyStr(LwpNumericFormatSubset aNumber, String& aP
     {
         if (bNegtive)
         {
-            aPrefix = String::CreateFromAscii("(");
+            aPrefix = rtl::OUString("(");
         }
         if (!bPost)
         {
             aPrefix += aSymbol;
             if (bShowSpace)
             {
-                aPrefix +=String::CreateFromAscii(" ");
+                aPrefix += rtl::OUString(" ");
             }
         }
     }
@@ -322,14 +322,14 @@ void LwpNumericFormat::GetCurrencyStr(LwpNumericFormatSubset aNumber, String& aP
             aSuffix = aSymbol;
             if (bShowSpace)
             {
-                aSuffix.Insert(String::CreateFromAscii(" "),0);
+                aSuffix.Insert(rtl::OUString(" "),0);
             }
 
         }
 
         if (bNegtive)
         {
-            aSuffix += String::CreateFromAscii(")");
+            aSuffix += rtl::OUString(")");
         }
     }
 }
@@ -421,11 +421,11 @@ XFStyle* LwpNumericFormat::Convert()
         {
             if (cNegative.IsDefaultPrefix() && aNegPrefix.Len() == 0)
             {
-                aNegPrefix = String::CreateFromAscii("(");
+                aNegPrefix = rtl::OUString("(");
             }
             if (cNegative.IsDefaultSuffix() && aNegSuffix.Len() == 0)
             {
-                aNegSuffix = String::CreateFromAscii(")");
+                aNegSuffix = rtl::OUString(")");
             }
         }
 
diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx b/lotuswordpro/source/filter/lwpnumericfmt.hxx
index 72f2faa1c8d3..97ff249d0e86 100644
--- a/lotuswordpro/source/filter/lwpnumericfmt.hxx
+++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx
@@ -193,50 +193,50 @@ private:
     void InitCurrencySymbol()
     {
         sal_uInt16 nC=FMT_ARGENTINEANPESO;
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("A"));                    //FMT_ARGENTINEANPESO       = 1,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("A$"));                   //FMT_AUSTRALIANDOLLAR  = 2,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("oS"),sal_True, sal_True);//FMT_AUSTRIANSCHILLING = 3,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("BF"),sal_True, sal_True);//FMT_BELGIANFRANC      = 4,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("R$"),sal_False, sal_True);//FMT_BRAZILIANCRUZEIRO    = 5,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("A"));                    //FMT_ARGENTINEANPESO       = 1,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("A$"));                   //FMT_AUSTRALIANDOLLAR  = 2,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("oS"),sal_True, sal_True);//FMT_AUSTRIANSCHILLING = 3,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("BF"),sal_True, sal_True);//FMT_BELGIANFRANC      = 4,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("R$"),sal_False, sal_True);//FMT_BRAZILIANCRUZEIRO    = 5,
         m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String("￡",RTL_TEXTENCODING_UTF8));                 //FMT_BRITISHPOUND      = 6,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("C$"));                   //FMT_CANADIANDOLLAR        = 7,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("C$"));                   //FMT_CANADIANDOLLAR        = 7,
         m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String("PRC￥",RTL_TEXTENCODING_UTF8),sal_False,sal_True);   //FMT_CHINESEYUAN           = 8,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Kc"),sal_True, sal_True);//FMT_CZECHKORUNA           = 9,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Dkr"),sal_False, sal_True);//FMT_DANISHKRONE         = 10,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("ECU"),sal_True, sal_True);//FMT_ECU                  = 11,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("mk"),sal_True, sal_True);//FMT_FINNISHMARKKA     = 12,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("F"),sal_True, sal_True);//FMT_FRENCHFRANC            = 13,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("DM"),sal_True, sal_True);//FMT_GERMANMARK            = 14,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Dr"),sal_True, sal_True);//FMT_GREEKDRACHMA      = 15,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("HK$"));                  //FMT_HONGKONGDOLLAR        = 16,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Ft"),sal_True, sal_True);//FMT_HUNGARIANFORINT       = 17,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Rs"),sal_False, sal_True);//FMT_INDIANRUPEE          = 18,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Rp"),sal_False, sal_True);//FMT_INDONESIANRUPIAH = 19,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Kc"),sal_True, sal_True);//FMT_CZECHKORUNA           = 9,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Dkr"),sal_False, sal_True);//FMT_DANISHKRONE         = 10,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("ECU"),sal_True, sal_True);//FMT_ECU                  = 11,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("mk"),sal_True, sal_True);//FMT_FINNISHMARKKA     = 12,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("F"),sal_True, sal_True);//FMT_FRENCHFRANC            = 13,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("DM"),sal_True, sal_True);//FMT_GERMANMARK            = 14,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Dr"),sal_True, sal_True);//FMT_GREEKDRACHMA      = 15,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("HK$"));                  //FMT_HONGKONGDOLLAR        = 16,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Ft"),sal_True, sal_True);//FMT_HUNGARIANFORINT       = 17,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Rs"),sal_False, sal_True);//FMT_INDIANRUPEE          = 18,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Rp"),sal_False, sal_True);//FMT_INDONESIANRUPIAH = 19,
         m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String("IR￡",RTL_TEXTENCODING_UTF8));                   //FMT_IRISHPUNT         = 20,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("L."),sal_False, sal_True);//FMT_ITALIANLIRA          = 21,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("L."),sal_False, sal_True);//FMT_ITALIANLIRA          = 21,
         m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String("￥",RTL_TEXTENCODING_UTF8));             //FMT_JAPANESEYEN           = 22,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("LF"),sal_True, sal_True);//FMT_LUXEMBOURGFRANC       = 23,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Rm"),sal_False, sal_True);//FMT_MALAYSIANRINGGIT = 24,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Mex$"));                 //FMT_MEXICANPESO           = 25,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("F"),sal_False, sal_True);//FMT_NETHERLANDSGUILDER    = 26,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("NZ$"));                  //FMT_NEWZEALANDDOLLAR  = 27,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Nkr"),sal_False, sal_True);//FMT_NORWEGIANKRONE      = 28,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Zl"),sal_True, sal_True);//FMT_POLISHZLOTY           = 29,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Esc."),sal_True, sal_True);//FMT_PORTUGUESEESCUDO    = 30,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Leu"),sal_True, sal_True);//FMT_ROMANIANLEI          = 31,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("R"),sal_True, sal_True);//FMT_RUSSIANRUBLE       = 32,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("S$"));                   //FMT_SINGAPOREDOLLAR       = 33,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Sk"),sal_True, sal_True);//FMT_SLOVAKIANKORUNA       = 34,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("SIT"),sal_False, sal_True);//FMT_SLOVENIANTHOLAR     = 35,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("R"));                    //FMT_SOUTHAFRICANRAND  = 36,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("W"));                    //FMT_SOUTHKOREANWON        = 37,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Pts"),sal_True, sal_True);//FMT_SPANISHPESETA        = 38,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Skr"),sal_True, sal_True);//FMT_SWEDISHKRONA     = 39,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("SFr"),sal_False, sal_True);//FMT_SWISSFRANC          = 40,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("NT$"));                  //FMT_TAIWANDOLLAR      = 41,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("Bt"),sal_True, sal_True);//FMT_THAIBAHT          = 42,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("$"));                    //FMT_USDOLLAR          = 43,
-        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(String::CreateFromAscii("OTH"),sal_False, sal_True);//FMT_OTHERCURRENCY       = 44,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("LF"),sal_True, sal_True);//FMT_LUXEMBOURGFRANC       = 23,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Rm"),sal_False, sal_True);//FMT_MALAYSIANRINGGIT = 24,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Mex$"));                 //FMT_MEXICANPESO           = 25,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("F"),sal_False, sal_True);//FMT_NETHERLANDSGUILDER    = 26,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("NZ$"));                  //FMT_NEWZEALANDDOLLAR  = 27,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Nkr"),sal_False, sal_True);//FMT_NORWEGIANKRONE      = 28,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Zl"),sal_True, sal_True);//FMT_POLISHZLOTY           = 29,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Esc."),sal_True, sal_True);//FMT_PORTUGUESEESCUDO    = 30,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Leu"),sal_True, sal_True);//FMT_ROMANIANLEI          = 31,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("R"),sal_True, sal_True);//FMT_RUSSIANRUBLE       = 32,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("S$"));                   //FMT_SINGAPOREDOLLAR       = 33,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Sk"),sal_True, sal_True);//FMT_SLOVAKIANKORUNA       = 34,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("SIT"),sal_False, sal_True);//FMT_SLOVENIANTHOLAR     = 35,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("R"));                    //FMT_SOUTHAFRICANRAND  = 36,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("W"));                    //FMT_SOUTHKOREANWON        = 37,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Pts"),sal_True, sal_True);//FMT_SPANISHPESETA        = 38,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Skr"),sal_True, sal_True);//FMT_SWEDISHKRONA     = 39,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("SFr"),sal_False, sal_True);//FMT_SWISSFRANC          = 40,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("NT$"));                  //FMT_TAIWANDOLLAR      = 41,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("Bt"),sal_True, sal_True);//FMT_THAIBAHT          = 42,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("$"));                    //FMT_USDOLLAR          = 43,
+        m_aCurrencyInfo[nC++]=LwpCurrencyInfo(rtl::OUString("OTH"),sal_False, sal_True);//FMT_OTHERCURRENCY       = 44,
 
         m_aCurrencyInfo[FMT_EURO]=LwpCurrencyInfo(String("€",RTL_TEXTENCODING_UTF8));             //FMT_EURO              = 52
     }
diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx
index bdef6dfe8458..e00e68e8e451 100644
--- a/lotuswordpro/source/filter/lwptblformula.cxx
+++ b/lotuswordpro/source/filter/lwptblformula.cxx
@@ -128,9 +128,9 @@ sal_Bool LwpFormulaInfo::ReadText()
     m_pObjStrm->QuickRead( pBuf.get(), nStrLen );
     *(pBuf.get()+nStrLen)='\0';
     String aText;
-    aText += String::CreateFromAscii("\"");
+    aText += rtl::OUString("\"");
     aText.Append(String(pBuf.get(),nStrLen,osl_getThreadTextEncoding()));
-    aText += String::CreateFromAscii("\"");
+    aText += rtl::OUString("\"");
 
     m_aStack.push_back(new LwpFormulaText(aText));
     return sal_True;
@@ -699,64 +699,64 @@ String LwpFormulaTools::GetName(sal_uInt16 nTokenType)
     switch(nTokenType)
     {
     case TK_SUM:
-        aName = String::CreateFromAscii("SUM");
+        aName = rtl::OUString("SUM");
         break;
     case TK_IF:
-        aName = String::CreateFromAscii("IF");//Not supported by SODC
+        aName = rtl::OUString("IF");//Not supported by SODC
         break;
     case TK_COUNT:
-        aName = String::CreateFromAscii("COUNT");//Not supported by SODC
+        aName = rtl::OUString("COUNT");//Not supported by SODC
         break;
     case TK_MINIMUM:
-        aName = String::CreateFromAscii("MIN");
+        aName = rtl::OUString("MIN");
         break;
     case TK_MAXIMUM:
-        aName = String::CreateFromAscii("MAX");
+        aName = rtl::OUString("MAX");
         break;
     case TK_AVERAGE:
-        aName = String::CreateFromAscii("MEAN");
+        aName = rtl::OUString("MEAN");
         break;
     case TK_ADD:
-        aName = String::CreateFromAscii("+");
+        aName = rtl::OUString("+");
         break;
     case TK_SUBTRACT:
-        aName = String::CreateFromAscii("-");
+        aName = rtl::OUString("-");
         break;
     case TK_MULTIPLY:
-        aName = String::CreateFromAscii("*");
+        aName = rtl::OUString("*");
         break;
     case TK_DIVIDE:
-        aName = String::CreateFromAscii("/");
+        aName = rtl::OUString("/");
         break;
     case TK_UNARY_MINUS:
-        aName = String::CreateFromAscii("-");
+        aName = rtl::OUString("-");
         break;
     case TK_LESS:
-        aName = String::CreateFromAscii("L");
+        aName = rtl::OUString("L");
         break;
     case TK_LESS_OR_EQUAL:
-        aName = String::CreateFromAscii("LEQ");
+        aName = rtl::OUString("LEQ");
         break;
     case TK_GREATER:
-        aName = String::CreateFromAscii("G");
+        aName = rtl::OUString("G");
         break;
     case TK_GREATER_OR_EQUAL:
-        aName = String::CreateFromAscii("GEQ");
+        aName = rtl::OUString("GEQ");
         break;
     case TK_EQUAL:
-        aName = String::CreateFromAscii("EQ");
+        aName = rtl::OUString("EQ");
         break;
     case TK_NOT_EQUAL:
-        aName = String::CreateFromAscii("NEQ");
+        aName = rtl::OUString("NEQ");
         break;
     case TK_NOT:
-        aName = String::CreateFromAscii("NOT");
+        aName = rtl::OUString("NOT");
         break;
     case TK_AND:
-        aName = String::CreateFromAscii("AND");
+        aName = rtl::OUString("AND");
         break;
     case TK_OR:
-        aName = String::CreateFromAscii("OR");
+        aName = rtl::OUString("OR");
         break;
     default:
         assert(false);
diff --git a/lotuswordpro/source/filter/lwptoc.cxx b/lotuswordpro/source/filter/lwptoc.cxx
index 29d8955c41f4..b5e268693ea4 100644
--- a/lotuswordpro/source/filter/lwptoc.cxx
+++ b/lotuswordpro/source/filter/lwptoc.cxx
@@ -153,7 +153,7 @@ void  LwpTocSuperLayout::XFConvert(XFContentContainer* pCont)
         if(!pLevel)
         {
             // add an blank template so that SODC won't add default style to this level
-            pToc->AddTemplate(Int32ToOUString(i),  String::CreateFromAscii(""), pTemplate);
+            pToc->AddTemplate(Int32ToOUString(i),  rtl::OUString(), pTemplate);
             continue;
         }