convert include/formula/IFunctionDescription.hxx from String to OUString

Change-Id: Ie3d3a3a55b50fe0dcac6be70fcce01fa544c374f

2 files changed, 9 insertions, 9 deletions

diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 6508fa90acd8..cd71adbf9501 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -308,7 +308,7 @@ sal_Bool ScFormulaDlg::Close()
 //  --------------------------------------------------------------------------
 //                          Funktionen fuer rechte Seite
 //  --------------------------------------------------------------------------
-bool ScFormulaDlg::calculateValue( const String& rStrExp, String& rStrResult )
+bool ScFormulaDlg::calculateValue( const OUString& rStrExp, OUString& rStrResult )
 {
     boost::scoped_ptr<ScSimpleFormulaCalculator> pFCell( new ScSimpleFormulaCalculator( pDoc, aCursorPos, rStrExp ) );
 
@@ -362,7 +362,7 @@ bool ScFormulaDlg::calculateValue( const String& rStrExp, String& rStrResult )
 
         ScRange aTestRange;
         if ( bColRowName || (aTestRange.Parse(rStrExp) & SCA_VALID) )
-            rStrResult.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " ..." ));
+            rStrResult += " ...";
             // Bereich
     }
     else
@@ -492,7 +492,7 @@ void ScFormulaDlg::insertEntryToLRUList(const formula::IFunctionDescription*
     const ScFuncDesc* pDesc = dynamic_cast<const ScFuncDesc*>(_pDesc);
     SaveLRUEntry(pDesc);
 }
-void ScFormulaDlg::showReference(const String& _sFormula)
+void ScFormulaDlg::showReference(const OUString& _sFormula)
 {
     ShowReference(_sFormula);
 }
@@ -605,7 +605,7 @@ formula::FormEditData* ScFormulaDlg::getFormEditData() const
     ScModule* pScMod = SC_MOD();
     return pScMod->GetFormEditData();
 }
-void ScFormulaDlg::setCurrentFormula(const String& _sReplacement)
+void ScFormulaDlg::setCurrentFormula(const OUString& _sReplacement)
 {
     ScModule* pScMod = SC_MOD();
     pScMod->InputReplaceSelection(_sReplacement);
@@ -620,7 +620,7 @@ void ScFormulaDlg::getSelection(xub_StrLen& _nStart,xub_StrLen& _nEnd) const
     ScModule* pScMod = SC_MOD();
     pScMod->InputGetSelection( _nStart, _nEnd );
 }
-String ScFormulaDlg::getCurrentFormula() const
+OUString ScFormulaDlg::getCurrentFormula() const
 {
     ScModule* pScMod = SC_MOD();
     return pScMod->InputGetFormulaStr();
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index 0a662e18da0d..76d0fc874c95 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -61,10 +61,10 @@ public:
     // IFormulaEditorHelper
     virtual void notifyChange();
     virtual void fill();
-    virtual bool calculateValue(const String& _sExpression,String& _rResult);
+    virtual bool calculateValue(const OUString& _sExpression, OUString& _rResult);
     virtual void doClose(sal_Bool _bOk);
     virtual void insertEntryToLRUList(const formula::IFunctionDescription*  pDesc);
-    virtual void showReference(const String& _sFormula);
+    virtual void showReference(const OUString& _sFormula);
     virtual void dispatch(sal_Bool _bOK,sal_Bool _bMartixChecked);
     virtual void setDispatcherLock( sal_Bool bLock );
     virtual void setReferenceInput(const formula::FormEditData* _pData);
@@ -72,10 +72,10 @@ public:
     virtual void clear();
     virtual void switchBack();
     virtual formula::FormEditData* getFormEditData() const;
-    virtual void setCurrentFormula(const String& _sReplacement);
+    virtual void setCurrentFormula(const OUString& _sReplacement);
     virtual void setSelection(xub_StrLen _nStart,xub_StrLen _nEnd);
     virtual void getSelection(xub_StrLen& _nStart,xub_StrLen& _nEnd) const;
-    virtual String getCurrentFormula() const;
+    virtual OUString getCurrentFormula() const;
 
     virtual formula::IFunctionManager* getFunctionManager();
     virtual ::std::auto_ptr<formula::FormulaTokenArray> convertToTokenArray(const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& _aTokenList);