Skip to content

C
core
Kaydet (Commit) e42e0efe authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

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

Change-Id: Ie3d3a3a55b50fe0dcac6be70fcce01fa544c374f
üst 21842bbb
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 40 deletions
formula/source/ui/dlg/formula.cxx
Dosyayı görüntüle @ e42e0efe
......@@ -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);
......
formula/source/ui/dlg/structpg.cxx
Dosyayı görüntüle @ e42e0efe
......@@ -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;
}
......
formula/source/ui/dlg/structpg.hxx
Dosyayı görüntüle @ e42e0efe
......@@ -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; }
......
include/formula/IFunctionDescription.hxx
Dosyayı görüntüle @ e42e0efe
......@@ -118,7 +118,7 @@ namespace formula
virtual SvTreeListEntry* InsertEntry(const OUString& rText, SvTreeListEntry* pParent,
sal_uInt16 nFlag,sal_uLong nPos=0,IFormulaToken* pScToken=NULL) = 0;
virtual String GetEntryText(SvTreeListEntry* pEntry) const = 0;
virtual OUString GetEntryText(SvTreeListEntry* pEntry) const = 0;
virtual SvTreeListEntry* GetParent(SvTreeListEntry* pEntry) const = 0;
protected:
......@@ -132,14 +132,14 @@ namespace formula
virtual void notifyChange() = 0;
virtual void fill() = 0;
virtual String getCurrentFormula() const = 0;
virtual void setCurrentFormula(const String& _sReplacement) = 0;
virtual OUString getCurrentFormula() const = 0;
virtual void setCurrentFormula(const OUString& _sReplacement) = 0;
virtual void getSelection(xub_StrLen& _nStart,xub_StrLen& _nEnd) const = 0;
virtual void setSelection(xub_StrLen _nStart,xub_StrLen _nEnd) = 0;
virtual FormEditData* getFormEditData() const = 0;
virtual bool calculateValue(const String& _sExpression,String& _rResult) = 0;
virtual bool calculateValue(const OUString& _sExpression, OUString& _rResult) = 0;
virtual void switchBack() = 0;
......@@ -158,7 +158,7 @@ namespace formula
virtual void dispatch(sal_Bool _bOK,sal_Bool _bMartixChecked) = 0;
virtual void doClose(sal_Bool _bOk) = 0;
virtual void insertEntryToLRUList(const IFunctionDescription* pDesc) = 0;
virtual void showReference(const String& _sFormula) = 0;
virtual void showReference(const OUString& _sFormula) = 0;
protected:
~IFormulaEditorHelper() {}
......
reportdesign/source/ui/dlg/Formula.cxx
Dosyayı görüntüle @ e42e0efe
......@@ -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;
}
......
reportdesign/source/ui/inc/Formula.hxx
Dosyayı görüntüle @ e42e0efe
......@@ -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;
......
sc/source/ui/formdlg/formula.cxx
Dosyayı görüntüle @ e42e0efe
......@@ -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();
......
sc/source/ui/inc/formula.hxx
Dosyayı görüntüle @ e42e0efe
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment