diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-02-07 14:04:53 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-02-07 17:16:35 +0200 |
| commit | 0608c2cbfe8697f9912397afce2987bee23fd1ce (patch) | |
| tree | 9aa502f91389e16c0f3b4290431671c7f538e8d6 /sc/source/core/tool/formulaopt.cxx | |
| parent | 590624fb2ba1daaa2730c5b1d633c089565f6e8f (diff) | |
Turn StringConversion into a C++11 scoped enumeration
Change-Id: I353a62bac6c8bf00b20c93d9778fc45ade5d502c
Diffstat (limited to 'sc/source/core/tool/formulaopt.cxx')
| -rw-r--r-- | sc/source/core/tool/formulaopt.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx index cd12d0a7c2ad..e9e474809882 100644 --- a/sc/source/core/tool/formulaopt.cxx +++ b/sc/source/core/tool/formulaopt.cxx @@ -387,16 +387,16 @@ void ScFormulaCfg::UpdateFromProperties( const Sequence<OUString>& aNames ) switch (nIntVal) { case 0: - eConv = ScCalcConfig::STRING_CONVERSION_AS_ERROR; + eConv = ScCalcConfig::StringConversion::ERROR; break; case 1: - eConv = ScCalcConfig::STRING_CONVERSION_AS_ZERO; + eConv = ScCalcConfig::StringConversion::ZERO; break; case 2: - eConv = ScCalcConfig::STRING_CONVERSION_UNAMBIGUOUS; + eConv = ScCalcConfig::StringConversion::UNAMBIGUOUS; break; case 3: - eConv = ScCalcConfig::STRING_CONVERSION_LOCALE_DEPENDENT; + eConv = ScCalcConfig::StringConversion::LOCALE; break; default: SAL_WARN("sc", "unknown string conversion option!"); @@ -558,10 +558,10 @@ void ScFormulaCfg::Commit() sal_Int32 nVal = 3; switch (GetCalcConfig().meStringConversion) { - case ScCalcConfig::STRING_CONVERSION_AS_ERROR: nVal = 0; break; - case ScCalcConfig::STRING_CONVERSION_AS_ZERO: nVal = 1; break; - case ScCalcConfig::STRING_CONVERSION_UNAMBIGUOUS: nVal = 2; break; - case ScCalcConfig::STRING_CONVERSION_LOCALE_DEPENDENT: nVal = 3; break; + case ScCalcConfig::StringConversion::ERROR: nVal = 0; break; + case ScCalcConfig::StringConversion::ZERO: nVal = 1; break; + case ScCalcConfig::StringConversion::UNAMBIGUOUS: nVal = 2; break; + case ScCalcConfig::StringConversion::LOCALE: nVal = 3; break; } pValues[nProp] <<= nVal; } |