diff options
author | Noel Grandin <noel@peralex.com> | 2013-09-20 13:52:35 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-10-01 10:08:38 +0200 |
commit | 9fc44bd23535d92e216b5244b97d587f570a8c31 (patch) | |
tree | 73887f987ebaeacdee4531885d2afc9a73128f84 /formula | |
parent | 9c15d1ad186abad14c55bda2c7daf1734e224754 (diff) |
convert remains of String to OUString in formula module
Change-Id: Ieca67b54535a6e11ba8fc20f6d02c501f6b7affd
Diffstat (limited to 'formula')
-rw-r--r-- | formula/source/core/api/FormulaCompiler.cxx | 19 | ||||
-rw-r--r-- | formula/source/ui/dlg/formula.cxx | 6 |
2 files changed, 9 insertions, 16 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 8bda44376a8c..5cd0b829dea2 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -819,11 +819,11 @@ FormulaCompiler::OpCodeMap::~OpCodeMap() delete mpHashMap; } -void FormulaCompiler::OpCodeMap::putCopyOpCode( const String& rSymbol, OpCode eOp ) +void FormulaCompiler::OpCodeMap::putCopyOpCode( const OUString& rSymbol, OpCode eOp ) { - SAL_WARN_IF( !mpTable[eOp].isEmpty() && !rSymbol.Len(), "formula.core", + SAL_WARN_IF( !mpTable[eOp].isEmpty() && rSymbol.isEmpty(), "formula.core", "OpCodeMap::putCopyOpCode: NOT replacing OpCode " << eOp << " '" << mpTable[eOp] << "' with empty name!"); - if (!mpTable[eOp].isEmpty() && !rSymbol.Len()) + if (!mpTable[eOp].isEmpty() && rSymbol.isEmpty()) mpHashMap->insert( OpCodeHashMap::value_type( mpTable[eOp], eOp)); else { @@ -857,15 +857,15 @@ void FormulaCompiler::OpCodeMap::copyFrom( const OpCodeMap& r, bool bOverrideKno { for (sal_uInt16 i = 1; i < n; ++i) { - String aSymbol; + OUString aSymbol; OpCode eOp = OpCode(i); switch (eOp) { case ocZGZ: - aSymbol = OUString("RRI"); + aSymbol = "RRI"; break; case ocTableOp: - aSymbol = OUString("MULTIPLE.OPERATIONS"); + aSymbol = "MULTIPLE.OPERATIONS"; break; default: aSymbol = r.mpTable[i]; @@ -1699,13 +1699,6 @@ void FormulaCompiler::CreateStringFromTokenArray( OUStringBuffer& rBuffer ) } } -FormulaToken* FormulaCompiler::CreateStringFromToken( String& rFormula, FormulaToken* pTokenP, bool bAllowArrAdvance ) -{ - OUStringBuffer aBuffer; - FormulaToken* p = CreateStringFromToken( aBuffer, pTokenP, bAllowArrAdvance ); - rFormula += aBuffer.makeStringAndClear(); - return p; -} FormulaToken* FormulaCompiler::CreateStringFromToken( OUString& rFormula, FormulaToken* pTokenP,bool bAllowArrAdvance ) { OUStringBuffer aBuffer; diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 2bd557b38ff2..be4604e5981a 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -899,7 +899,7 @@ void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev) } else { - aFtEditName.SetText(String()); + aFtEditName.SetText(""); pMEdit->SetHelpId( m_aEditHelpId ); } // Test, ob vorne/hinten noch mehr Funktionen sind @@ -917,8 +917,8 @@ void FormulaDlg_Impl::ClearAllParas() DeleteArgs(); pFuncDesc = NULL; pParaWin->ClearAll(); - aWndResult.SetValue(String()); - aFtFuncName.SetText(String()); + aWndResult.SetValue(OUString()); + aFtFuncName.SetText(OUString()); FuncSelHdl(NULL); if(pFuncPage->IsVisible()) |