convert remains of String to OUString in formula module

Change-Id: Ieca67b54535a6e11ba8fc20f6d02c501f6b7affd

formula/source/core/api/FormulaCompiler.cxx

@@ -819,11 +819,11 @@ FormulaCompiler::OpCodeMap::~OpCodeMap()
     delete mpHashMap;
 }
 
-void FormulaCompiler::OpCodeMap::putCopyOpCode( const String& rSymbol, OpCode eOp )
+void FormulaCompiler::OpCodeMap::putCopyOpCode( const OUString& rSymbol, OpCode eOp )
 {
-    SAL_WARN_IF( !mpTable[eOp].isEmpty() && !rSymbol.Len(), "formula.core",
+    SAL_WARN_IF( !mpTable[eOp].isEmpty() && rSymbol.isEmpty(), "formula.core",
             "OpCodeMap::putCopyOpCode: NOT replacing OpCode " << eOp << " '" << mpTable[eOp] << "' with empty name!");
-    if (!mpTable[eOp].isEmpty() && !rSymbol.Len())
+    if (!mpTable[eOp].isEmpty() && rSymbol.isEmpty())
         mpHashMap->insert( OpCodeHashMap::value_type( mpTable[eOp], eOp));
     else
     {
@@ -857,15 +857,15 @@ void FormulaCompiler::OpCodeMap::copyFrom( const OpCodeMap& r, bool bOverrideKno
     {
         for (sal_uInt16 i = 1; i < n; ++i)
         {
-            String aSymbol;
+            OUString aSymbol;
             OpCode eOp = OpCode(i);
             switch (eOp)
             {
                 case ocZGZ:
-                    aSymbol = OUString("RRI");
+                    aSymbol = "RRI";
                     break;
                 case ocTableOp:
-                    aSymbol = OUString("MULTIPLE.OPERATIONS");
+                    aSymbol = "MULTIPLE.OPERATIONS";
                     break;
                 default:
                     aSymbol = r.mpTable[i];
@@ -1699,13 +1699,6 @@ void FormulaCompiler::CreateStringFromTokenArray( OUStringBuffer& rBuffer )
     }
 }
 
-FormulaToken* FormulaCompiler::CreateStringFromToken( String& rFormula, FormulaToken* pTokenP, bool bAllowArrAdvance )
-{
-    OUStringBuffer aBuffer;
-    FormulaToken* p = CreateStringFromToken( aBuffer, pTokenP, bAllowArrAdvance );
-    rFormula += aBuffer.makeStringAndClear();
-    return p;
-}
 FormulaToken* FormulaCompiler::CreateStringFromToken( OUString& rFormula, FormulaToken* pTokenP,bool bAllowArrAdvance )
 {
     OUStringBuffer aBuffer;

formula/source/ui/dlg/formula.cxx

@@ -899,7 +899,7 @@ void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev)
     }
     else
     {
-        aFtEditName.SetText(String());
+        aFtEditName.SetText("");
         pMEdit->SetHelpId( m_aEditHelpId );
     }
         //  Test, ob vorne/hinten noch mehr Funktionen sind
@@ -917,8 +917,8 @@ void FormulaDlg_Impl::ClearAllParas()
     DeleteArgs();
     pFuncDesc = NULL;
     pParaWin->ClearAll();
-    aWndResult.SetValue(String());
-    aFtFuncName.SetText(String());
+    aWndResult.SetValue(OUString());
+    aFtFuncName.SetText(OUString());
     FuncSelHdl(NULL);
 
     if(pFuncPage->IsVisible())

include/formula/FormulaCompiler.hxx

@@ -189,7 +189,7 @@ public:
 
             Does NOT check eOp range!
          */
-        void putCopyOpCode( const String& rSymbol, OpCode eOp );
+        void putCopyOpCode( const OUString& rSymbol, OpCode eOp );
     };
 
 public:
@@ -241,8 +241,6 @@ public:
 
     void CreateStringFromTokenArray( OUString& rFormula );
     void CreateStringFromTokenArray( OUStringBuffer& rBuffer );
-    FormulaToken* CreateStringFromToken( String& rFormula, FormulaToken* pToken,
-                                    bool bAllowArrAdvance = false );
     FormulaToken* CreateStringFromToken( OUString& rFormula, FormulaToken* pToken,
                                     bool bAllowArrAdvance = false );
     FormulaToken* CreateStringFromToken( OUStringBuffer& rBuffer, FormulaToken* pToken,

sc/source/ui/unoobj/chart2uno.cxx

@@ -862,7 +862,7 @@ public:
     {
         ScCompiler aCompiler(mpDoc, ScAddress(0,0,0));
         aCompiler.SetGrammar(meGrammar);
-        String aStr;
+        OUString aStr;
         aCompiler.CreateStringFromToken(aStr, rToken.get());
         if (mbFirst)
             mbFirst = false;
@@ -931,13 +931,13 @@ public:
         ScCompiler aCompiler(mpDoc, ScAddress(0,0,0));
         aCompiler.SetGrammar(FormulaGrammar::GRAM_ENGLISH);
         {
-            String aStr;
+            OUString aStr;
             aCompiler.CreateStringFromToken(aStr, aStart.get());
             mpRangeStr->append(aStr);
         }
         mpRangeStr->append(mcAddrSep);
         {
-            String aStr;
+            OUString aStr;
             aCompiler.CreateStringFromToken(aStr, aEnd.get());
             mpRangeStr->append(aStr);
         }