summaryrefslogtreecommitdiff
path: root/formula
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-11-04 14:00:40 +0200
committerNoel Grandin <noel@peralex.com>2013-11-11 11:21:26 +0200
commite52779d2f8722c713f72aedbf475267440d729f0 (patch)
tree0f2f15b2a7645e0b75f8057c96c90e05e1a6e7df /formula
parente9c4ee996d5a6bf895072613ac4e488346ee5b05 (diff)
remove unnecessary use of OUString constructor
Change-Id: Ifb220af71857ddacd64e8204fb6d3e4aad8eef71
Diffstat (limited to 'formula')
-rw-r--r--formula/source/core/api/FormulaCompiler.cxx12
-rw-r--r--formula/source/ui/dlg/formula.cxx18
2 files changed, 15 insertions, 15 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 804fb032fbff..f54d00b26e5d 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -184,12 +184,12 @@ bool OpCodeList::getOpCodeString( OUString& rStr, sal_uInt16 nOp )
{
if (meSepType == COMMA_BASE)
{
- rStr = OUString(",");
+ rStr = ",";
return true;
}
else if (meSepType == SEMICOLON_BASE)
{
- rStr = OUString(";");
+ rStr = ";";
return true;
}
}
@@ -198,12 +198,12 @@ bool OpCodeList::getOpCodeString( OUString& rStr, sal_uInt16 nOp )
{
if (meSepType == COMMA_BASE)
{
- rStr = OUString(",");
+ rStr = ",";
return true;
}
else if (meSepType == SEMICOLON_BASE)
{
- rStr = OUString(";");
+ rStr = ";";
return true;
}
}
@@ -212,12 +212,12 @@ bool OpCodeList::getOpCodeString( OUString& rStr, sal_uInt16 nOp )
{
if (meSepType == COMMA_BASE)
{
- rStr = OUString(";");
+ rStr = ";";
return true;
}
else if (meSepType == SEMICOLON_BASE)
{
- rStr = OUString("|");
+ rStr = "|";
return true;
}
}
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index be4604e5981a..344ce5ee252c 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -433,9 +433,9 @@ uno::Reference< sheet::XFormulaOpCodeMapper > FormulaDlg_Impl::GetFormulaOpCodeM
m_pBinaryOpCodesEnd = m_aBinaryOpCodes.getConstArray() + m_aBinaryOpCodes.getLength();
uno::Sequence< OUString > aArgs(3);
- aArgs[TOKEN_OPEN] = OUString("(");
- aArgs[TOKEN_CLOSE] = OUString(")");
- aArgs[TOKEN_SEP] = OUString(";");
+ aArgs[TOKEN_OPEN] = "(";
+ aArgs[TOKEN_CLOSE] = ")";
+ aArgs[TOKEN_SEP] = ";";
m_aSeparatorsOpCodes = m_xOpCodeMapper->getMappings(aArgs,sheet::FormulaLanguage::ODFF);
m_aSpecialOpCodes = m_xOpCodeMapper->getAvailableMappings(sheet::FormulaLanguage::ODFF,sheet::FormulaMapGroup::SPECIAL);
@@ -822,7 +822,7 @@ void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev)
// 2. Page or Edit: show selected function
xub_StrLen nFStart = pData->GetFStart();
- OUString aFormula = OUString(m_pHelper->getCurrentFormula()) + " )";
+ OUString aFormula = m_pHelper->getCurrentFormula() + " )";
xub_StrLen nNextFStart = nFStart;
xub_StrLen nNextFEnd = 0;
@@ -1033,7 +1033,7 @@ IMPL_LINK_NOARG(FormulaDlg_Impl, DblClkHdl)
const IFunctionDescription* pDesc = pFuncPage->GetFuncDesc(nFunc);
m_pHelper->insertEntryToLRUList(pDesc);
- OUString aFuncName = OUString( pFuncPage->GetSelFunctionName() ) + "()";
+ OUString aFuncName = pFuncPage->GetSelFunctionName() + "()";
m_pHelper->setCurrentFormula(aFuncName);
pMEdit->ReplaceSelected(aFuncName);
@@ -1167,7 +1167,7 @@ void FormulaDlg_Impl::SaveArg( sal_uInt16 nEd )
for(sal_uInt16 i=0; i<=nEd; i++)
{
if ( m_aArguments[i].isEmpty() )
- m_aArguments[i] = OUString(" ");
+ m_aArguments[i] = " ";
}
if(!pParaWin->GetArgument(nEd).isEmpty())
m_aArguments[nEd] = pParaWin->GetArgument(nEd);
@@ -1183,7 +1183,7 @@ void FormulaDlg_Impl::SaveArg( sal_uInt16 nEd )
for(sal_uInt16 i=nClearPos; i<nArgs; i++)
{
- m_aArguments[i] = OUString();
+ m_aArguments[i] = "";
}
}
}
@@ -1424,7 +1424,7 @@ void FormulaDlg_Impl::RefInputStartAfter( RefEdit* /*pEdit*/, RefButton* /*pButt
if( pTheRefEdit )
{
- OUString aStr = OUString(aTitle2) + " " + aFtEditName.GetText() + "( ";
+ OUString aStr = aTitle2 + " " + aFtEditName.GetText() + "( ";
if( pParaWin->GetActiveLine() > 0 )
aStr += "...; ";
@@ -1467,7 +1467,7 @@ void FormulaDlg_Impl::Update()
{
FormEditData* pData = m_pHelper->getFormEditData();
const OUString sExpression = pMEdit->GetText();
- aOldFormula = OUString();
+ aOldFormula = "";
UpdateTokenArray(sExpression);
FormulaCursorHdl(&aMEFormula);
CalcStruct(sExpression);