diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-07-04 23:58:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-07-09 12:16:56 +0100 |
| commit | 104261010aa5ccbb7df4a82a3a3cafcfb0591fa7 (patch) | |
| tree | b8db79d2707ff5925ad01dba8a41bd8ab6d66847 /formula | |
| parent | 1a1e953ee33c213dc8b88dd96a69ca9fc5e42d50 (diff) | |
some UniString->rtl::OUString
Change-Id: Ie69b30094da25df23a36baca2c7723d6a41f48c3
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/core/api/FormulaCompiler.cxx | 8 | ||||
| -rw-r--r-- | formula/source/ui/dlg/formula.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index e2e30597def1..0a3d9afbe3f3 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -670,9 +670,9 @@ void FormulaCompiler::InitSymbolsEnglishXL() const // TODO: For now, just replace the separators to the Excel English // variants. Later, if we want to properly map Excel functions with Calc // functions, we'll need to do a little more work here. - mxSymbolsEnglishXL->putOpCode(sal_Unicode(','), ocSep); - mxSymbolsEnglishXL->putOpCode(sal_Unicode(','), ocArrayColSep); - mxSymbolsEnglishXL->putOpCode(sal_Unicode(';'), ocArrayRowSep); + mxSymbolsEnglishXL->putOpCode(rtl::OUString(','), ocSep); + mxSymbolsEnglishXL->putOpCode(rtl::OUString(','), ocArrayColSep); + mxSymbolsEnglishXL->putOpCode(rtl::OUString(';'), ocArrayRowSep); } // ----------------------------------------------------------------------------- @@ -1766,7 +1766,7 @@ void FormulaCompiler::AppendString( rtl::OUStringBuffer& rBuffer, const String & else { String aStr( rStr ); - aStr.SearchAndReplaceAll( '"', String( RTL_CONSTASCII_USTRINGPARAM( "\"\""))); + aStr.SearchAndReplaceAll( rtl::OUString('"'), rtl::OUString("\"\"") ); rBuffer.append(aStr); } rBuffer.append(sal_Unicode('"')); diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index b32f64d2cd89..26473c01f8cb 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -937,7 +937,7 @@ void FormulaDlg_Impl::ClearAllParas() } String FormulaDlg_Impl::RepairFormula(const String& aFormula) { - String aResult('='); + rtl::OUString aResult('='); try { UpdateTokenArray(aFormula); |