diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-13 13:00:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-14 06:19:20 +0000 |
| commit | cb45d0d4272da54f90cb2b03d2cdbe1a4eebc75c (patch) | |
| tree | e3bfd003052ed1d0d86ea853c88cf0fc470ff0ec /sw/source/uibase/inc/conttree.hxx | |
| parent | 2c93e16d65e486524e4d066d68fddcaa5811078b (diff) | |
convert CONTENT_TYPE to scoped enum
Change-Id: I84b6d595f3997207385355f2bb3a9b64e6c9977b
Reviewed-on: https://gerrit.libreoffice.org/18536
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw/source/uibase/inc/conttree.hxx')
| -rw-r--r-- | sw/source/uibase/inc/conttree.hxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index aa6ff6b9ef4c..72728761a181 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -25,6 +25,7 @@ #include "swcont.hxx" #include <map> +#include <o3tl/enumarray.hxx> class SwWrtShell; class SwContentType; @@ -52,8 +53,8 @@ class SwContentTree OUString sSpace; AutoTimer aUpdTimer; - SwContentType* aActiveContentArr[CONTENT_TYPE_MAX]; - SwContentType* aHiddenContentArr[CONTENT_TYPE_MAX]; + o3tl::enumarray<ContentTypeId,SwContentType*> aActiveContentArr; + o3tl::enumarray<ContentTypeId,SwContentType*> aHiddenContentArr; OUString aContextStrings[CONTEXT_COUNT + 1]; OUString sRemoveIdx; OUString sUpdateIdx; @@ -73,9 +74,9 @@ class SwContentTree sal_Int32 nActiveBlock; sal_Int32 nHiddenBlock; - sal_uInt16 nRootType; - sal_uInt16 nLastSelType; - sal_uInt8 nOutlineLevel; + ContentTypeId nRootType; + ContentTypeId nLastSelType; + sal_uInt8 nOutlineLevel; bool bIsActive :1; bool bIsConstant :1; @@ -150,7 +151,7 @@ public: SdrObject* GetDrawingObjectsByContent(const SwContent *pCnt); bool ToggleToRoot(); - void SetRootType(sal_uInt16 nType); + void SetRootType(ContentTypeId nType); void Display( bool bActiveView ); void Clear(); void SetHiddenShell(SwWrtShell* pSh); |