diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-02 16:09:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-03 12:13:44 +0000 |
| commit | 1cfedbc960d25ee322b0a0e7aae8dc73758b406e (patch) | |
| tree | 1bcaac3e77e9693f9c3897d7c091acd603aff3fa /include/svx | |
| parent | f1ea8c43a8ab6b8d158d4d8f3a0039b3a2ac2c37 (diff) | |
drop SvxNumType and rename SvxExtNumType->SvxNumType
Both of them are abstractions over the css::style::NumberingType
constants.
SvxNumType serves no useful purpose, since it's just a typedef to
sal_Int16.
At least SvxExtNumType wraps up the css::style::NumberingType constants
in a nice enum.
Change-Id: I7b3f97cd42b0aa23aff7a4db4930da86149d4f4e
Reviewed-on: https://gerrit.libreoffice.org/34816
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/svx')
| -rw-r--r-- | include/svx/nbdtmg.hxx | 2 | ||||
| -rw-r--r-- | include/svx/pageitem.hxx | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index f1cd4de00c9d..992bd8330773 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -43,7 +43,7 @@ enum class NBType class SVX_DLLPUBLIC NumSettings_Impl { public: - SvxExtNumType nNumberType; + SvxNumType nNumberType; short nParentNumbering; SvxNumberFormat::LabelFollowedBy eLabelFollowedBy; long nTabValue; diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx index 5849473a932e..0a322a6a08d0 100644 --- a/include/svx/pageitem.hxx +++ b/include/svx/pageitem.hxx @@ -21,8 +21,7 @@ #include <svl/poolitem.hxx> #include <svx/svxdllapi.h> - -using SvxNumType = sal_Int16; // css::style::NumberingType constants +#include <editeng/svxenum.hxx> /*-------------------------------------------------------------------- usage of the page @@ -50,7 +49,7 @@ class SVX_DLLPUBLIC SvxPageItem: public SfxPoolItem { private: OUString aDescName; // name of the template - SvxNumType eNumType; // enumeration + SvxNumType eNumType; bool bLandscape; // Portrait / Landscape SvxPageUsage eUse; // Layout |