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/qa | |
| parent | 590624fb2ba1daaa2730c5b1d633c089565f6e8f (diff) | |
Turn StringConversion into a C++11 scoped enumeration
Change-Id: I353a62bac6c8bf00b20c93d9778fc45ade5d502c
Diffstat (limited to 'sc/qa')
| -rw-r--r-- | sc/qa/unit/ucalc.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index b839816dae1c..df258bcfecf9 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -1534,7 +1534,7 @@ void Test::testFuncParam() ScCalcConfig aConfig; // With "Convert also locale dependent" and "Empty string as zero"=True option. - aConfig.meStringConversion = ScCalcConfig::STRING_CONVERSION_LOCALE_DEPENDENT; + aConfig.meStringConversion = ScCalcConfig::StringConversion::LOCALE; aConfig.mbEmptyStringAsZero = true; m_pDoc->SetCalcConfig(aConfig); m_pDoc->CalcAll(); @@ -1550,7 +1550,7 @@ void Test::testFuncParam() CPPUNIT_ASSERT_MESSAGE("incorrect result", val == 7.4); // With "Convert also locale dependent" and "Empty string as zero"=False option. - aConfig.meStringConversion = ScCalcConfig::STRING_CONVERSION_LOCALE_DEPENDENT; + aConfig.meStringConversion = ScCalcConfig::StringConversion::LOCALE; aConfig.mbEmptyStringAsZero = false; m_pDoc->SetCalcConfig(aConfig); m_pDoc->CalcAll(); @@ -1566,7 +1566,7 @@ void Test::testFuncParam() CPPUNIT_ASSERT_MESSAGE("incorrect result", val == 7.4); // With "Convert only unambiguous" and "Empty string as zero"=True option. - aConfig.meStringConversion = ScCalcConfig::STRING_CONVERSION_UNAMBIGUOUS; + aConfig.meStringConversion = ScCalcConfig::StringConversion::UNAMBIGUOUS; aConfig.mbEmptyStringAsZero = true; m_pDoc->SetCalcConfig(aConfig); m_pDoc->CalcAll(); @@ -1582,7 +1582,7 @@ void Test::testFuncParam() CPPUNIT_ASSERT_MESSAGE("incorrect result", aVal == "#VALUE!"); // With "Convert only unambiguous" and "Empty string as zero"=False option. - aConfig.meStringConversion = ScCalcConfig::STRING_CONVERSION_UNAMBIGUOUS; + aConfig.meStringConversion = ScCalcConfig::StringConversion::UNAMBIGUOUS; aConfig.mbEmptyStringAsZero = false; m_pDoc->SetCalcConfig(aConfig); m_pDoc->CalcAll(); @@ -1598,7 +1598,7 @@ void Test::testFuncParam() CPPUNIT_ASSERT_MESSAGE("incorrect result", aVal == "#VALUE!"); // With "Treat as zero" ("Empty string as zero" is ignored). - aConfig.meStringConversion = ScCalcConfig::STRING_CONVERSION_AS_ZERO; + aConfig.meStringConversion = ScCalcConfig::StringConversion::ZERO; aConfig.mbEmptyStringAsZero = true; m_pDoc->SetCalcConfig(aConfig); m_pDoc->CalcAll(); @@ -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::STRING_CONVERSION_AS_ERROR; + aConfig.meStringConversion = ScCalcConfig::StringConversion::ERROR; aConfig.mbEmptyStringAsZero = false; m_pDoc->SetCalcConfig(aConfig); m_pDoc->CalcAll(); |