diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-12 13:32:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-12 13:35:33 +0200 |
| commit | 0780e58e57557d83362ec3a431415f1a4c90b729 (patch) | |
| tree | dd2379ee73bc588022f533858a6ea0d08bdaca32 /sc/inc/formularesult.hxx | |
| parent | 4d6bed289044a0541e64097477ff5ffd810fc978 (diff) | |
Revert "convert MULTILINE constants to scoped enum"
This reverts commit b5e352e5117fffaca8cfddde426079708a208258.
GCC4.8 doesn't like the combination of a scoped enum and
storing such a type in a bitfield. And it has a bug
(still present in its current master) which prevents us from
suppressing the warning nicely.
Change-Id: I8c73e4c5175cfc43a1b8251ad85d262ad89c4f4d
Diffstat (limited to 'sc/inc/formularesult.hxx')
| -rw-r--r-- | sc/inc/formularesult.hxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx index 9150ab939869..b19b001640a1 100644 --- a/sc/inc/formularesult.hxx +++ b/sc/inc/formularesult.hxx @@ -47,9 +47,11 @@ struct FormulaResultValue and memory consumption. */ class ScFormulaResult { - enum class Multiline { - Unknown, False, True - }; + typedef unsigned char Multiline; + static const Multiline MULTILINE_UNKNOWN = 0; + static const Multiline MULTILINE_FALSE = 1; + static const Multiline MULTILINE_TRUE = 2; + // Clone token if the 16-bit only reference counter is nearing it's // capacity during fill or copy&paste, leaving 4k for temporary passing // around. (That should be enough for all times (TM) ;-) |