diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-02-07 18:01:15 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-02-07 18:02:59 +0200 |
| commit | b749e4d3b77b8bb8203b5cde88142d4416b7651f (patch) | |
| tree | 1e91c28b228222c4efcea3b5f85655861d49fc24 /sc | |
| parent | We (will) need ScCalcConfig also for formula groups (diff) | |
| download | core-b749e4d3b77b8bb8203b5cde88142d4416b7651f.tar.gz core-b749e4d3b77b8bb8203b5cde88142d4416b7651f.zip | |
ERROR is a macro on Windows, try ILLEGAL then
Change-Id: Iae0c5308f77657c6a55bafd372ce7e4db5ef4aab
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/calcconfig.hxx | 2 | ||||
| -rw-r--r-- | sc/qa/unit/ucalc.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/calcconfig.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/formulaopt.cxx | 4 | ||||
| -rw-r--r-- | sc/source/core/tool/interpr4.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/optdlg/calcoptionsdlg.cxx | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx index 314aa95cc598..d10154c426f4 100644 --- a/sc/inc/calcconfig.hxx +++ b/sc/inc/calcconfig.hxx @@ -35,7 +35,7 @@ struct SC_DLLPUBLIC ScCalcConfig // from most stringent to most relaxed enum class StringConversion { - ERROR, ///< =1+"1" or =1+"x" give #VALUE! + ILLEGAL, ///< =1+"1" or =1+"x" give #VALUE! ZERO, ///< =1+"1" or =1+"x" give 1 UNAMBIGUOUS, ///< =1+"1" gives 2, but =1+"1.000" or =1+"x" give #VALUE! LOCALE ///< =1+"1.000" may be 2 or 1001 ... =1+"x" gives #VALUE! diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index df258bcfecf9..03c4a5249ea4 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -1614,7 +1614,7 @@ void Test::testFuncParam() CPPUNIT_ASSERT_MESSAGE("incorrect result", val == 3); // With "Generate #VALUE! error" ("Empty string as zero" is ignored). - aConfig.meStringConversion = ScCalcConfig::StringConversion::ERROR; + aConfig.meStringConversion = ScCalcConfig::StringConversion::ILLEGAL; aConfig.mbEmptyStringAsZero = false; m_pDoc->SetCalcConfig(aConfig); m_pDoc->CalcAll(); diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx index bcea83fbfa96..e4e62e1dd565 100644 --- a/sc/source/core/tool/calcconfig.cxx +++ b/sc/source/core/tool/calcconfig.cxx @@ -105,7 +105,7 @@ std::string StringConversionToString(ScCalcConfig::StringConversion eConv) { switch (eConv) { - case ScCalcConfig::StringConversion::ERROR: return "ERROR"; + case ScCalcConfig::StringConversion::ILLEGAL: return "ILLEGAL"; case ScCalcConfig::StringConversion::ZERO: return "ZERO"; case ScCalcConfig::StringConversion::UNAMBIGUOUS: return "UNAMBIGUOUS"; case ScCalcConfig::StringConversion::LOCALE: return "LOCALE"; diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx index e9e474809882..1480ada92182 100644 --- a/sc/source/core/tool/formulaopt.cxx +++ b/sc/source/core/tool/formulaopt.cxx @@ -387,7 +387,7 @@ void ScFormulaCfg::UpdateFromProperties( const Sequence<OUString>& aNames ) switch (nIntVal) { case 0: - eConv = ScCalcConfig::StringConversion::ERROR; + eConv = ScCalcConfig::StringConversion::ILLEGAL; break; case 1: eConv = ScCalcConfig::StringConversion::ZERO; @@ -558,7 +558,7 @@ void ScFormulaCfg::Commit() sal_Int32 nVal = 3; switch (GetCalcConfig().meStringConversion) { - case ScCalcConfig::StringConversion::ERROR: nVal = 0; break; + case ScCalcConfig::StringConversion::ILLEGAL: nVal = 0; break; case ScCalcConfig::StringConversion::ZERO: nVal = 1; break; case ScCalcConfig::StringConversion::UNAMBIGUOUS: nVal = 2; break; case ScCalcConfig::StringConversion::LOCALE: nVal = 3; break; diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 70a6b8792b97..fea7e6e44ab7 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -253,7 +253,7 @@ double ScInterpreter::ConvertStringToValue( const OUString& rStr ) switch (maCalcConfig.meStringConversion) { - case ScCalcConfig::StringConversion::ERROR: + case ScCalcConfig::StringConversion::ILLEGAL: SetError( mnStringNoValueError); return fValue; case ScCalcConfig::StringConversion::ZERO: diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index 7db6ae881181..5a82dfee107e 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -168,7 +168,7 @@ IMPL_LINK(ScCalcOptionsDialog, ConversionModifiedHdl, ListBox*, pConv ) maConfig.meStringConversion = (ScCalcConfig::StringConversion)pConv->GetSelectEntryPos(); switch (maConfig.meStringConversion) { - case ScCalcConfig::StringConversion::ERROR: + case ScCalcConfig::StringConversion::ILLEGAL: maConfig.mbEmptyStringAsZero = false; mpEmptyAsZero->Check(false); mpEmptyAsZero->Enable(false); |