summaryrefslogtreecommitdiff
path: root/sc/inc/calcconfig.hxx
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-02-07 18:01:15 +0200
committerTor Lillqvist <tml@collabora.com>2015-02-07 18:02:59 +0200
commitb749e4d3b77b8bb8203b5cde88142d4416b7651f (patch)
tree1e91c28b228222c4efcea3b5f85655861d49fc24 /sc/inc/calcconfig.hxx
parent9429cf24675ae6b3a954db560ca567c9413d0ab6 (diff)
ERROR is a macro on Windows, try ILLEGAL then
Change-Id: Iae0c5308f77657c6a55bafd372ce7e4db5ef4aab
Diffstat (limited to 'sc/inc/calcconfig.hxx')
-rw-r--r--sc/inc/calcconfig.hxx2
1 files changed, 1 insertions, 1 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!