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/ui/optdlg | |
| parent | 590624fb2ba1daaa2730c5b1d633c089565f6e8f (diff) | |
Turn StringConversion into a C++11 scoped enumeration
Change-Id: I353a62bac6c8bf00b20c93d9778fc45ade5d502c
Diffstat (limited to 'sc/source/ui/optdlg')
| -rw-r--r-- | sc/source/ui/optdlg/calcoptionsdlg.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index 0eada39c8130..7db6ae881181 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -71,7 +71,7 @@ ScCalcOptionsDialog::ScCalcOptionsDialog(vcl::Window* pParent, const ScCalcConfi get(mpFtMemory, "memory"); get(mpConversion,"comboConversion"); - mpConversion->SelectEntryPos(rConfig.meStringConversion, true); + mpConversion->SelectEntryPos(static_cast<sal_Int32>(rConfig.meStringConversion), true); mpConversion->SetSelectHdl(LINK(this, ScCalcOptionsDialog, ConversionModifiedHdl)); get(mpEmptyAsZero,"checkEmptyAsZero"); @@ -168,18 +168,18 @@ IMPL_LINK(ScCalcOptionsDialog, ConversionModifiedHdl, ListBox*, pConv ) maConfig.meStringConversion = (ScCalcConfig::StringConversion)pConv->GetSelectEntryPos(); switch (maConfig.meStringConversion) { - case ScCalcConfig::STRING_CONVERSION_AS_ERROR: + case ScCalcConfig::StringConversion::ERROR: maConfig.mbEmptyStringAsZero = false; mpEmptyAsZero->Check(false); mpEmptyAsZero->Enable(false); break; - case ScCalcConfig::STRING_CONVERSION_AS_ZERO: + case ScCalcConfig::StringConversion::ZERO: maConfig.mbEmptyStringAsZero = true; mpEmptyAsZero->Check(true); mpEmptyAsZero->Enable(false); break; - case ScCalcConfig::STRING_CONVERSION_UNAMBIGUOUS: - case ScCalcConfig::STRING_CONVERSION_LOCALE_DEPENDENT: + case ScCalcConfig::StringConversion::UNAMBIGUOUS: + case ScCalcConfig::StringConversion::LOCALE: // Reset to the value the user selected before. maConfig.mbEmptyStringAsZero = mbSelectedEmptyStringAsZero; mpEmptyAsZero->Enable(true); |