From f733ca910026daa2232f2e2de3394bd36134dd78 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Wed, 11 Sep 2013 13:55:05 +0200
Subject: convert include/formula/formula.hxx from String to OUString

Change-Id: Id3c1dfa97805dfa3a1978cd264380d5ef4a2287a
---
 reportdesign/source/ui/dlg/Formula.cxx | 10 +++++-----
 reportdesign/source/ui/inc/Formula.hxx |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'reportdesign')

diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index 6abf2f1ba6d2..1469c0557bfc 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -53,14 +53,14 @@ FormulaDialog::FormulaDialog(Window* pParent
     ,m_pAddField(NULL)
     ,m_xRowSet(_xRowSet)
     ,m_pEdit(NULL)
-    ,m_sFormula(OUString("="))
+    ,m_sFormula("=")
     ,m_nStart(0)
     ,m_nEnd(1)
 {
     if ( !_sFormula.isEmpty() )
     {
-        if ( _sFormula.getStr()[0] != '=' )
-            m_sFormula += String(_sFormula);
+        if ( _sFormula[0] != '=' )
+            m_sFormula += _sFormula;
         else
             m_sFormula = _sFormula;
     }
@@ -141,9 +141,9 @@ void FormulaDialog::setCurrentFormula(const String& _sReplacement)
     const xub_StrLen nOldLen = m_nEnd - m_nStart;
     const xub_StrLen nNewLen = _sReplacement.Len();
     if (nOldLen)
-        m_sFormula.Erase( m_nStart, nOldLen );
+        m_sFormula = m_sFormula.replaceAt( m_nStart, nOldLen, "" );
     if (nNewLen)
-        m_sFormula.Insert( _sReplacement, m_nStart );
+        m_sFormula = m_sFormula.replaceAt( m_nStart, 0, _sReplacement );
     m_nEnd = m_nStart + nNewLen;
 }
 void FormulaDialog::setSelection(xub_StrLen _nStart,xub_StrLen _nEnd)
diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx
index c551bbdf95e0..a8670a6171cd 100644
--- a/reportdesign/source/ui/inc/Formula.hxx
+++ b/reportdesign/source/ui/inc/Formula.hxx
@@ -47,7 +47,7 @@ class FormulaDialog : public formula::FormulaModalDialog,
     ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFormulaParser>   m_xParser;
     ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper>    m_xOpCodeMapper;
     formula::RefEdit*           m_pEdit;
-    String                      m_sFormula;
+    OUString                    m_sFormula;
     xub_StrLen                  m_nStart;
     xub_StrLen                  m_nEnd;
 
-- 
cgit