From 60f36bb7cd5956fa30b3f7ebe8a1489ed0f98685 Mon Sep 17 00:00:00 2001 From: Jochen Nitschke Date: Mon, 25 Jul 2016 14:53:18 +0200 Subject: sc: convert SC_SCENARIO_.. defines typed flags .. ScScenarioFlags add ScScenarioFlags::NONE for 0. replace uses of '-= flag' with '&= ~flag'. Change-Id: I003c0ca1f59b060f52935fec8bb6282fd9981805 Reviewed-on: https://gerrit.libreoffice.org/27464 Tested-by: Jochen Nitschke Reviewed-by: Noel Grandin --- sc/inc/global.hxx | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'sc/inc/global.hxx') diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 4af5cf19ca6b..073d2ab2bfb6 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -206,14 +206,20 @@ enum class ScEnterMode { // step = 10pt, max. indention = 100 steps #define SC_INDENT_STEP 200 - // scenario flags -#define SC_SCENARIO_COPYALL 1 -#define SC_SCENARIO_SHOWFRAME 2 -#define SC_SCENARIO_PRINTFRAME 4 -#define SC_SCENARIO_TWOWAY 8 -#define SC_SCENARIO_ATTRIB 16 -#define SC_SCENARIO_VALUE 32 -#define SC_SCENARIO_PROTECT 64 +enum class ScScenarioFlags{ // scenario flags + NONE = 0, + CopyAll = 1, + ShowFrame = 2, + PrintFrame = 4, + TwoWay = 8, + Attrib = 16, + Value = 32, + Protected = 64 +}; +namespace o3tl +{ + template<> struct typed_flags : is_typed_flags {}; +} #define SUBTOTAL_IGN_NESTED_ST_AG 0x08 #define SUBTOTAL_IGN_ERR_VAL 0x04 -- cgit