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

Change-Id: Ie3d3a3a55b50fe0dcac6be70fcce01fa544c374f

2 files changed, 9 insertions, 9 deletions

diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index 1469c0557bfc..00ae00f26b3e 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -99,7 +99,7 @@ FormulaDialog::~FormulaDialog()
 //  --------------------------------------------------------------------------
 //                          Funktionen fuer rechte Seite
 //  --------------------------------------------------------------------------
-bool FormulaDialog::calculateValue( const String& rStrExp, String& rStrResult )
+bool FormulaDialog::calculateValue( const OUString& rStrExp, OUString& rStrResult )
 {
     rStrResult = rStrExp;
     return false;
@@ -111,7 +111,7 @@ void FormulaDialog::doClose(sal_Bool _bOk)
 void FormulaDialog::insertEntryToLRUList(const IFunctionDescription*    /*_pDesc*/)
 {
 }
-void FormulaDialog::showReference(const String& /*_sFormula*/)
+void FormulaDialog::showReference(const OUString& /*_sFormula*/)
 {
 }
 void FormulaDialog::dispatch(sal_Bool /*_bOK*/,sal_Bool /*_bMartixChecked*/)
@@ -136,10 +136,10 @@ FormEditData* FormulaDialog::getFormEditData() const
 {
     return m_pFormulaData;
 }
-void FormulaDialog::setCurrentFormula(const String& _sReplacement)
+void FormulaDialog::setCurrentFormula(const OUString& _sReplacement)
 {
     const xub_StrLen nOldLen = m_nEnd - m_nStart;
-    const xub_StrLen nNewLen = _sReplacement.Len();
+    const sal_Int32 nNewLen = _sReplacement.getLength();
     if (nOldLen)
         m_sFormula = m_sFormula.replaceAt( m_nStart, nOldLen, "" );
     if (nNewLen)
@@ -164,7 +164,7 @@ void FormulaDialog::getSelection(xub_StrLen& _nStart,xub_StrLen& _nEnd) const
     _nStart = m_nStart;
     _nEnd = m_nEnd;
 }
-String FormulaDialog::getCurrentFormula() const
+OUString FormulaDialog::getCurrentFormula() const
 {
     return m_sFormula;
 }
diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx
index a8670a6171cd..cc52754476bb 100644
--- a/reportdesign/source/ui/inc/Formula.hxx
+++ b/reportdesign/source/ui/inc/Formula.hxx
@@ -63,10 +63,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);
@@ -74,10 +74,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 ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser> getFormulaParser() const;