diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-24 13:39:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-25 09:07:48 +0200 |
| commit | bd7c9afb8b3c49cae80593414eeb262f2e1fb643 (patch) | |
| tree | 4b24641a73341334888ff86c97b0be2ed3e6d3f1 /rsc/inc/rsctop.hxx | |
| parent | a0ee31da5cb12e353da745455f1b4e9f147410da (diff) | |
convert VAR constants to o3tl::typed_flags
and drop the unused EXTENDABLE
Change-Id: Iddb2d4c1f3a3f76e4687ad002c0c4b9f7e6ca055
Diffstat (limited to 'rsc/inc/rsctop.hxx')
| -rw-r--r-- | rsc/inc/rsctop.hxx | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx index b4feec0166f8..24d4082404b7 100644 --- a/rsc/inc/rsctop.hxx +++ b/rsc/inc/rsctop.hxx @@ -24,15 +24,20 @@ #include <rschash.hxx> #include <rscclobj.hxx> #include <rsc/rscsfx.hxx> - -typedef sal_uInt32 RSCVAR; -#define VAR_POINTER 0x0001 -#define VAR_HIDDEN 0x0002 -#define VAR_NODATAINST 0x0004 -#define VAR_NORC 0x0008 -#define VAR_SVDYNAMIC 0x0010 -#define VAR_NOENUM 0x0020 -#define VAR_EXTENDABLE 0x0040 /* class derivation can all be given */ +#include <o3tl/typed_flags_set.hxx> + +enum class RSCVAR { + NONE = 0x0000, + Pointer = 0x0001, + Hidden = 0x0002, + NoDataInst = 0x0004, + NoRc = 0x0008, + SvDynamic = 0x0010, + NoEnum = 0x0020 +}; +namespace o3tl { + template<> struct typed_flags<RSCVAR> : is_typed_flags<RSCVAR, 0x007f> {}; +} class RscTop : public RefNode { @@ -83,7 +88,7 @@ public: // sets the variable virtual ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, RSCINST * pDflt = nullptr, - RSCVAR nVarType = 0, sal_uInt32 nMask = 0, + RSCVAR nVarType = RSCVAR::NONE, sal_uInt32 nMask = 0, Atom nDataBaseName = InvalidAtom ); // enumerate all variables |