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/inc | |
| parent | 590624fb2ba1daaa2730c5b1d633c089565f6e8f (diff) | |
Turn StringConversion into a C++11 scoped enumeration
Change-Id: I353a62bac6c8bf00b20c93d9778fc45ade5d502c
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/calcconfig.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx index 7cc8fadcc7d0..314aa95cc598 100644 --- a/sc/inc/calcconfig.hxx +++ b/sc/inc/calcconfig.hxx @@ -33,12 +33,12 @@ enum ScRecalcOptions struct SC_DLLPUBLIC ScCalcConfig { // from most stringent to most relaxed - enum StringConversion + enum class StringConversion { - STRING_CONVERSION_AS_ERROR = 0, ///< =1+"1" or =1+"x" give #VALUE! - STRING_CONVERSION_AS_ZERO, ///< =1+"1" or =1+"x" give 1 - STRING_CONVERSION_UNAMBIGUOUS, ///< =1+"1" gives 2, but =1+"1.000" or =1+"x" give #VALUE! - STRING_CONVERSION_LOCALE_DEPENDENT ///< =1+"1.000" may be 2 or 1001 ... =1+"x" gives #VALUE! + ERROR, ///< =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! }; formula::FormulaGrammar::AddressConvention meStringRefAddressSyntax; StringConversion meStringConversion; |