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/content.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/content.hxx')
-rw-r--r-- | sw/source/uibase/inc/content.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx index adcb3f799527..10cfa93bcb80 100644 --- a/sw/source/uibase/inc/content.hxx +++ b/sw/source/uibase/inc/content.hxx @@ -156,7 +156,7 @@ class SwContentType : public SwTypeNumber OUString sSingleContentTypeName; // name of content type, singular OUString sTypeToken; // attachment for URL size_t nMemberCount; // content count - sal_uInt16 nContentType; // content type's Id + ContentTypeId nContentType; // content type's Id sal_uInt8 nOutlineLevel; bool bDataValid : 1; bool bEdit: 1; // can this type be edited? @@ -164,14 +164,14 @@ class SwContentType : public SwTypeNumber protected: static OUString RemoveNewline(const OUString&); public: - SwContentType(SwWrtShell* pParent, sal_uInt16 nType, sal_uInt8 nLevel ); + SwContentType(SwWrtShell* pParent, ContentTypeId nType, sal_uInt8 nLevel ); virtual ~SwContentType(); void Init(bool* pbInvalidateWindow = 0); void FillMemberList(bool* pbLevelChanged = NULL); size_t GetMemberCount() const {return nMemberCount;}; - sal_uInt16 GetType() const {return nContentType;} + ContentTypeId GetType() const {return nContentType;} const SwContent* GetMember(size_t nIndex); const OUString& GetName() {return sContentTypeName;} const OUString& GetSingleName() const {return sSingleContentTypeName;} |