convert the rest of the formula module from String to OUString

Change-Id: I27ee0cf3e9f97e94234c5e32080bf102b4cf0dc9

formula/source/core/api/FormulaCompiler.cxx

@@ -147,7 +147,7 @@ public:
     OpCodeList( sal_uInt16, FormulaCompiler::NonConstOpCodeMapPtr );
 
 private:
-    bool getOpCodeString( String& rStr, sal_uInt16 nOp );
+    bool getOpCodeString( OUString& rStr, sal_uInt16 nOp );
     void putDefaultOpCode( FormulaCompiler::NonConstOpCodeMapPtr xMap, sal_uInt16 nOp );
 
 private:
@@ -165,7 +165,7 @@ OpCodeList::OpCodeList( sal_uInt16 nRID, FormulaCompiler::NonConstOpCodeMapPtr x
 {
     for (sal_uInt16 i = 0; i <= SC_OPCODE_LAST_OPCODE_ID; ++i)
     {
-        String aOpStr;
+        OUString aOpStr;
         if ( getOpCodeString( aOpStr, i) )
             xMap->putOpCode( aOpStr, OpCode(i));
         else
@@ -175,7 +175,7 @@ OpCodeList::OpCodeList( sal_uInt16 nRID, FormulaCompiler::NonConstOpCodeMapPtr x
     FreeResource();
 }
 
-bool OpCodeList::getOpCodeString( String& rStr, sal_uInt16 nOp )
+bool OpCodeList::getOpCodeString( OUString& rStr, sal_uInt16 nOp )
 {
     switch (nOp)
     {
@@ -878,7 +878,7 @@ void FormulaCompiler::OpCodeMap::copyFrom( const OpCodeMap& r, bool bOverrideKno
         for (sal_uInt16 i = 1; i < n; ++i)
         {
             OpCode eOp = OpCode(i);
-            const String& rSymbol = r.mpTable[i];
+            const OUString& rSymbol = r.mpTable[i];
             putCopyOpCode( rSymbol, eOp);
         }
     }

formula/source/ui/dlg/FormulaHelper.cxx

@@ -175,14 +175,14 @@ void FormulaHelper::GetArgStrings( ::std::vector< OUString >& _rArgs,
 
 //------------------------------------------------------------------------
 
-inline sal_Bool IsFormulaText( const CharClass* _pCharClass,const String& rStr, xub_StrLen nPos )
+inline sal_Bool IsFormulaText( const CharClass* _pCharClass,const OUString& rStr, xub_StrLen nPos )
 {
     if( _pCharClass->isLetterNumeric( rStr, nPos ) )
         return sal_True;
     else
     {   // In internationalized versions function names may contain a dot
         //  and in every version also an underscore... ;-)
-        sal_Unicode c = rStr.GetChar(nPos);
+        sal_Unicode c = rStr[nPos];
         return c == '.' || c == '_';
     }
 

formula/source/ui/dlg/funcutl.cxx

@@ -285,7 +285,7 @@ void ArgInput::SetArgName(const OUString &aArg)
 #************************************************************************/
 OUString ArgInput::GetArgName()
 {
-    String aPrivArgName;
+    OUString aPrivArgName;
     if(pFtArg !=NULL)
         aPrivArgName=pFtArg->GetText();
 

formula/source/ui/dlg/parawin.cxx

@@ -96,18 +96,18 @@ void ParaWin::UpdateArgDesc( sal_uInt16 nArg )
 
     if ( (nArgs > 0) && (nArg<nArgs) )
     {
-        String  aArgDesc;
-        String  aArgName;
+        OUString  aArgDesc;
+        OUString  aArgName;
 
-        SetArgumentDesc( String() );
-        SetArgumentText( String() );
+        SetArgumentDesc( OUString() );
+        SetArgumentText( OUString() );
 
         if ( nArgs < VAR_ARGS )
         {
             sal_uInt16 nRealArg = (aVisibleArgMapping.size() < nArg) ? aVisibleArgMapping[nArg] : nArg;
             aArgDesc  = pFuncDesc->getParameterDescription(nRealArg);
             aArgName  = pFuncDesc->getParameterName(nRealArg);
-            aArgName += ' ';
+            aArgName += " ";
             aArgName += (pFuncDesc->isParameterOptional(nRealArg)) ? m_sOptional : m_sRequired ;
         }
         else if ( nArgs < PAIRED_VAR_ARGS )
@@ -120,7 +120,7 @@ void ParaWin::UpdateArgDesc( sal_uInt16 nArg )
             aArgName  = pFuncDesc->getParameterName(nRealArg);
             if ( nArg >= nFix )
                 aArgName += OUString::number( nArg-nFix+1 );
-            aArgName += ' ';
+            aArgName += " ";
 
             aArgName += (nArg > nFix || pFuncDesc->isParameterOptional(nRealArg)) ? m_sOptional : m_sRequired ;
         }
@@ -138,7 +138,7 @@ void ParaWin::UpdateArgDesc( sal_uInt16 nArg )
             aArgName  = pFuncDesc->getParameterName(nRealArg);
             if ( nArg >= nFix )
                 aArgName += OUString::number( (nArg-nFix)/2 + 1 );
-            aArgName += ' ';
+            aArgName += " ";
 
             aArgName += (nArg > (nFix+1) || pFuncDesc->isParameterOptional(nRealArg)) ? m_sOptional : m_sRequired ;
         }
@@ -172,7 +172,7 @@ void ParaWin::UpdateArgInput( sal_uInt16 nOffset, sal_uInt16 i )
                 aFntLight : aFntBold );
         if ( nArg >= nFix )
         {
-            String aArgName( pFuncDesc->getParameterName(nRealArg) );
+            OUString aArgName( pFuncDesc->getParameterName(nRealArg) );
             aArgName += OUString::number(nArg-nFix+1);
             SetArgName( i, aArgName );
         }
@@ -194,7 +194,7 @@ void ParaWin::UpdateArgInput( sal_uInt16 nOffset, sal_uInt16 i )
                 aFntLight : aFntBold );
         if ( nArg >= nFix )
         {
-            String aArgName( pFuncDesc->getParameterName(nRealArg) );
+            OUString aArgName( pFuncDesc->getParameterName(nRealArg) );
             aArgName += OUString::number( (nArg-nFix)/2 + 1 );
             SetArgName( i, aArgName );
         }
@@ -296,9 +296,9 @@ void ParaWin::SetFunctionDesc(const IFunctionDescription* pFDesc)
 {
     pFuncDesc=pFDesc;
 
-    SetArgumentDesc( String() );
-    SetArgumentText( String() );
-    SetEditDesc( String() );
+    SetArgumentDesc( OUString() );
+    SetArgumentText( OUString() );
+    SetEditDesc( OUString() );
     nArgs = 0;
     if ( pFuncDesc!=NULL)
     {
@@ -417,7 +417,7 @@ void ParaWin::SetArgumentOffset(sal_uInt16 nOffset)
     {
         for ( int i=0; i<4 && i<nArgs; i++ )
         {
-            String aString;
+            OUString aString;
             aArgInput[i].SetArgVal(aString);
             aArgInput[i].GetArgEdPtr()->Init(
                 (i==0)               ? (ArgEdit *)NULL : aArgInput[i-1].GetArgEdPtr(),