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>

4 files changed, 9 insertions, 10 deletions

diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 16fd8df5d8b0..a417029f966d 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -55,19 +55,19 @@ class EDITENG_DLLPUBLIC SvxNumberType
     static sal_Int32 nRefCount;
     static css::uno::Reference<css::text::XNumberingFormatter> xFormatter;
 
-    SvxExtNumType   nNumType;
+    SvxNumType      nNumType;
     bool            bShowSymbol;        // Also show Symbol ?
 
 public:
-    explicit SvxNumberType(SvxExtNumType nType = SVX_NUM_ARABIC);
+    explicit SvxNumberType(SvxNumType nType = SVX_NUM_ARABIC);
     SvxNumberType(const SvxNumberType& rType);
     ~SvxNumberType();
 
     OUString        GetNumStr( sal_uLong nNo ) const;
     OUString        GetNumStr( sal_uLong nNo, const css::lang::Locale& rLocale ) const;
 
-    void            SetNumberingType(SvxExtNumType nSet) {nNumType = nSet;}
-    SvxExtNumType   GetNumberingType() const {return nNumType;}
+    void            SetNumberingType(SvxNumType nSet) {nNumType = nSet;}
+    SvxNumType      GetNumberingType() const {return nNumType;}
 
     void            SetShowSymbol(bool bSet) {bShowSymbol = bSet;}
     bool            IsShowSymbol()const{return bShowSymbol;}
@@ -142,7 +142,7 @@ private:
     OUString            sCharStyleName;     // Character Style
 
 public:
-    explicit SvxNumberFormat( SvxExtNumType nNumberingType,
+    explicit SvxNumberFormat( SvxNumType nNumberingType,
                      SvxNumPositionAndSpaceMode ePositionAndSpaceMode = LABEL_WIDTH_AND_POSITION );
     SvxNumberFormat(const SvxNumberFormat& rFormat);
     SvxNumberFormat( SvStream & rStream );
diff --git a/include/editeng/svxenum.hxx b/include/editeng/svxenum.hxx
index de4268025317..3f8e47c73ecd 100644
--- a/include/editeng/svxenum.hxx
+++ b/include/editeng/svxenum.hxx
@@ -149,7 +149,7 @@ enum class SvxSpellArea
 /**
  * these must match the values in css::style::NumberingType
  */
-enum SvxExtNumType
+enum SvxNumType
 {
     SVX_NUM_CHARS_UPPER_LETTER    = css::style::NumberingType::CHARS_UPPER_LETTER,    // Counts from a-z, aa - az, ba - bz, ...
     SVX_NUM_CHARS_LOWER_LETTER    = css::style::NumberingType::CHARS_LOWER_LETTER,
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