diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-13 13:51:07 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-17 09:03:23 +0200 |
| commit | c88ce9033beb6e9ea60c4c04c7f8a1b641c2927b (patch) | |
| tree | 355b58f1a292b7f6938da990e2a37330abdd14d1 /sc | |
| parent | 8f23a3b0e2484fea4a85f4d5b961a718c71877a9 (diff) | |
convert aCorrectedFormula in formula::FormulaCompiler to OUString
Change-Id: I048ec33effc33e94943f5110d6a9a0937a1dfdfe
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/compiler.hxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/compiler.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 6d2a1e4bc218..b0fc18c1bf1d 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -425,7 +425,7 @@ public: void SetExtendedErrorDetection( ExtendedErrorDetection eVal ) { meExtendedErrorDetection = eVal; } bool IsCorrected() { return bCorrected; } - const String& GetCorrectedFormula() { return aCorrectedFormula; } + const OUString& GetCorrectedFormula() { return aCorrectedFormula; } // Use convention from this->aPos by default ScTokenArray* CompileString( const OUString& rFormula ); diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 13271c445658..82e9a131084e 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -3664,7 +3664,7 @@ ScTokenArray* ScCompiler::CompileString( const OUString& rFormula ) bCorrected = false; if ( bAutoCorrect ) { - aCorrectedFormula.Erase(); + aCorrectedFormula = ""; aCorrectedSymbol = ""; } sal_uInt8 nForced = 0; // ==formula forces recalc even if cell is not visible @@ -3673,14 +3673,14 @@ ScTokenArray* ScCompiler::CompileString( const OUString& rFormula ) nSrcPos++; nForced++; if ( bAutoCorrect ) - aCorrectedFormula += '='; + aCorrectedFormula += "="; } if( aFormula.GetChar(nSrcPos) == '=' ) { nSrcPos++; nForced++; if ( bAutoCorrect ) - aCorrectedFormula += '='; + aCorrectedFormula += "="; } struct FunctionStack { |