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 <j.nitschke+logerrit@ok.de>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

4 files changed, 28 insertions, 22 deletions

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index f860dbc574ed..5d034189f120 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -825,14 +825,14 @@ public:
     SC_DLLPUBLIC bool           IsNegativePage( SCTAB nTab ) const;
     SC_DLLPUBLIC void           SetScenario( SCTAB nTab, bool bFlag );
     SC_DLLPUBLIC bool           IsScenario( SCTAB nTab ) const;
-    SC_DLLPUBLIC void GetScenarioData( SCTAB nTab, OUString& rComment,
-                                       Color& rColor, sal_uInt16& rFlags ) const;
-    SC_DLLPUBLIC void           SetScenarioData( SCTAB nTab, const OUString& rComment,
-                                        const Color& rColor, sal_uInt16 nFlags );
+    SC_DLLPUBLIC void           GetScenarioData(SCTAB nTab, OUString& rComment,
+                                                Color& rColor, ScScenarioFlags &rFlags) const;
+    SC_DLLPUBLIC void           SetScenarioData(SCTAB nTab, const OUString& rComment,
+                                          const Color& rColor, ScScenarioFlags nFlags);
     SC_DLLPUBLIC Color GetTabBgColor( SCTAB nTab ) const;
     SC_DLLPUBLIC void SetTabBgColor( SCTAB nTab, const Color& rColor );
     SC_DLLPUBLIC bool IsDefaultTabBgColor( SCTAB nTab ) const;
-    void            GetScenarioFlags( SCTAB nTab, sal_uInt16& rFlags ) const;
+    void                        GetScenarioFlags(SCTAB nTab, ScScenarioFlags &rFlags) const;
     SC_DLLPUBLIC bool           IsActiveScenario( SCTAB nTab ) const;
     SC_DLLPUBLIC void           SetActiveScenario( SCTAB nTab, bool bActive );      // only for Undo etc.
     SC_DLLPUBLIC formula::FormulaGrammar::AddressConvention GetAddressConvention() const;
@@ -1502,9 +1502,9 @@ public:
 
     void            CopyScenario( SCTAB nSrcTab, SCTAB nDestTab, bool bNewScenario = false );
     bool            TestCopyScenario( SCTAB nSrcTab, SCTAB nDestTab ) const;
-    void            MarkScenario( SCTAB nSrcTab, SCTAB nDestTab,
-                                    ScMarkData& rDestMark, bool bResetMark = true,
-                                    sal_uInt16 nNeededBits = 0 ) const;
+    void            MarkScenario(SCTAB nSrcTab, SCTAB nDestTab,
+                                ScMarkData& rDestMark, bool bResetMark = true,
+                                ScScenarioFlags nNeededBits = ScScenarioFlags::NONE) const;
     bool            HasScenarioRange( SCTAB nTab, const ScRange& rRange ) const;
     SC_DLLPUBLIC const ScRangeList* GetScenarioRanges( SCTAB nTab ) const;
 
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<ScScenarioFlags> : is_typed_flags<ScScenarioFlags, 127> {};
+}
 
 #define SUBTOTAL_IGN_NESTED_ST_AG  0x08
 #define SUBTOTAL_IGN_ERR_VAL       0x04
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 8c6c6c50677f..76e4387bba56 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -275,10 +275,10 @@ class AbstractScNewScenarioDlg : public VclAbstractDialog
 public:
 
     virtual void SetScenarioData( const OUString& rName, const OUString& rComment,
-                            const Color& rColor, sal_uInt16 nFlags ) = 0;
+                            const Color& rColor, ScScenarioFlags nFlags ) = 0;
 
     virtual void GetScenarioData( OUString& rName, OUString& rComment,
-                            Color& rColor, sal_uInt16& rFlags ) const = 0;
+                            Color& rColor, ScScenarioFlags& rFlags ) const = 0;
 };
 
 class AbstractScShowTabDlg : public VclAbstractDialog
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 0450f6b103df..bd6344657dfa 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -184,7 +184,7 @@ private:
     ScRangeList*    pScenarioRanges;
     Color           aScenarioColor;
     Color           aTabBgColor;
-    sal_uInt16          nScenarioFlags;
+    ScScenarioFlags nScenarioFlags;
     ScDBData*       pDBDataNoName;
     mutable ScRangeName* mpRangeName;
 
@@ -279,8 +279,8 @@ public:
     void         SetScenarioColor(const Color& rNew)         { aScenarioColor = rNew; }
     const Color& GetTabBgColor() const                       { return aTabBgColor; }
     void         SetTabBgColor(const Color& rColor);
-    sal_uInt16  GetScenarioFlags() const                     { return nScenarioFlags; }
-    void        SetScenarioFlags(sal_uInt16 nNew)            { nScenarioFlags = nNew; }
+    ScScenarioFlags GetScenarioFlags() const                 { return nScenarioFlags; }
+    void        SetScenarioFlags(ScScenarioFlags nNew)       { nScenarioFlags = nNew; }
     void        SetActiveScenario(bool bSet)                 { bActiveScenario = bSet; }
     bool        IsActiveScenario() const                     { return bActiveScenario; }
 
@@ -475,7 +475,7 @@ public:
     void        CopyScenarioFrom( const ScTable* pSrcTab );
     void        CopyScenarioTo( ScTable* pDestTab ) const;
     bool        TestCopyScenarioTo( const ScTable* pDestTab ) const;
-    void        MarkScenarioIn( ScMarkData& rMark, sal_uInt16 nNeededBits ) const;
+    void        MarkScenarioIn(ScMarkData& rMark, ScScenarioFlags nNeededBits) const;
     bool        HasScenarioRange( const ScRange& rRange ) const;
     void        InvalidateScenarioRanges();
     const ScRangeList* GetScenarioRanges() const;