diff options
Diffstat (limited to 'formula')
-rw-r--r-- | formula/source/ui/dlg/formula.cxx | 26 | ||||
-rw-r--r-- | formula/source/ui/dlg/structpg.cxx | 6 | ||||
-rw-r--r-- | formula/source/ui/dlg/structpg.hxx | 2 |
3 files changed, 17 insertions, 17 deletions
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 7f54a59255a3..3879bb08a9c8 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -91,8 +91,8 @@ namespace formula RefInputStartBefore( RefEdit* pEdit, RefButton* pButton ); void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton ); void RefInputDoneAfter( sal_Bool bForced ); - sal_Bool CalcValue( const String& rStrExp, String& rStrResult ); - sal_Bool CalcStruct( const String& rStrExp); + sal_Bool CalcValue( const OUString& rStrExp, OUString& rStrResult ); + sal_Bool CalcStruct( const String& rStrExp); void UpdateValues(); void DeleteArgs(); xub_StrLen GetFunctionPos(xub_StrLen nPos); @@ -572,11 +572,11 @@ xub_StrLen FormulaDlg_Impl::GetFunctionPos(xub_StrLen nPos) return nFuncPos; } // ----------------------------------------------------------------------------- -sal_Bool FormulaDlg_Impl::CalcValue( const String& rStrExp, String& rStrResult ) +sal_Bool FormulaDlg_Impl::CalcValue( const OUString& rStrExp, OUString& rStrResult ) { sal_Bool bResult = sal_True; - if ( rStrExp.Len() > 0 ) + if ( !rStrExp.isEmpty() ) { // Only calculate the value when there isn't any more keyboard input: @@ -593,17 +593,17 @@ sal_Bool FormulaDlg_Impl::CalcValue( const String& rStrExp, String& rStrResult ) void FormulaDlg_Impl::UpdateValues() { - String aStrResult; + OUString aStrResult; if ( CalcValue( pFuncDesc->getFormula( m_aArguments ), aStrResult ) ) aWndResult.SetValue( aStrResult ); - aStrResult.Erase(); + aStrResult = ""; if ( CalcValue(m_pHelper->getCurrentFormula(), aStrResult ) ) aWndFormResult.SetValue( aStrResult ); else { - aStrResult.Erase(); + aStrResult = ""; aWndFormResult.SetValue( aStrResult ); } CalcStruct(pMEdit->GetText()); @@ -629,7 +629,7 @@ sal_Bool FormulaDlg_Impl::CalcStruct( const String& rStrExp) } aString = comphelper::string::remove(aString, '\n'); - String aStrResult; + OUString aStrResult; if ( CalcValue(aString, aStrResult ) ) aWndFormResult.SetValue( aStrResult ); @@ -770,13 +770,13 @@ void FormulaDlg_Impl::FillDialog(sal_Bool nFlag) aBtnForward.Enable(bNext); } - String aStrResult; + OUString aStrResult; if ( CalcValue(m_pHelper->getCurrentFormula(), aStrResult ) ) aWndFormResult.SetValue( aStrResult ); else { - aStrResult.Erase(); + aStrResult = ""; aWndFormResult.SetValue( aStrResult ); } } @@ -1273,15 +1273,15 @@ IMPL_LINK_NOARG(FormulaDlg_Impl, FormulaHdl) m_pHelper->setCurrentFormula(aString); m_pHelper->setSelection((xub_StrLen)aSel.Min(),(xub_StrLen)aSel.Max()); - xub_StrLen nPos=(xub_StrLen)aSel.Min()-1; + xub_StrLen nPos = (xub_StrLen)aSel.Min()-1; - String aStrResult; + OUString aStrResult; if ( CalcValue(m_pHelper->getCurrentFormula(), aStrResult ) ) aWndFormResult.SetValue( aStrResult ); else { - aStrResult.Erase(); + aStrResult = ""; aWndFormResult.SetValue( aStrResult ); } CalcStruct(aString); diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx index d672f73c1ab4..81bb9f50244a 100644 --- a/formula/source/ui/dlg/structpg.cxx +++ b/formula/source/ui/dlg/structpg.cxx @@ -133,11 +133,11 @@ SvTreeListEntry* StructPage::InsertEntry( const OUString& rText, SvTreeListEntry return pEntry; } -String StructPage::GetEntryText(SvTreeListEntry* pEntry) const +OUString StructPage::GetEntryText(SvTreeListEntry* pEntry) const { - String aString; + OUString aString; if(pEntry!=NULL) - aString=aTlbStruct.GetEntryText(pEntry); + aString = aTlbStruct.GetEntryText(pEntry); return aString; } diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx index fe68eead386f..11cf636b35ed 100644 --- a/formula/source/ui/dlg/structpg.hxx +++ b/formula/source/ui/dlg/structpg.hxx @@ -96,7 +96,7 @@ public: virtual SvTreeListEntry* InsertEntry(const OUString& rText, SvTreeListEntry* pParent, sal_uInt16 nFlag,sal_uLong nPos=0,IFormulaToken* pScToken=NULL); - virtual String GetEntryText(SvTreeListEntry* pEntry) const; + virtual OUString GetEntryText(SvTreeListEntry* pEntry) const; virtual SvTreeListEntry* GetParent(SvTreeListEntry* pEntry) const; void SetSelectionHdl( const Link& rLink ) { aSelLink = rLink; } |