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>

3 files changed, 10 insertions, 10 deletions

diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index 1d451f2d00df..b55fb6fa989d 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -125,16 +125,16 @@ enum SwJumpEditFormat
 
 class SwPageNumberFieldType : public SwFieldType
 {
-    SvxExtNumType   nNumberingType;
+    SvxNumType      nNumberingType;
     bool            bVirtuell;
 
 public:
     SwPageNumberFieldType();
 
-    OUString Expand( SvxExtNumType nFormat, short nOff, sal_uInt16 const nPageNumber,
+    OUString Expand( SvxNumType nFormat, short nOff, sal_uInt16 const nPageNumber,
                      sal_uInt16 const nMaxPage, const OUString& ) const;
     void ChangeExpansion( SwDoc* pDoc,
-                          bool bVirtPageNum, const SvxExtNumType* pNumFormat );
+                          bool bVirtPageNum, const SvxNumType* pNumFormat );
     virtual SwFieldType* Copy() const override;
 };
 
@@ -247,14 +247,14 @@ public:
 class SwDocStatFieldType : public SwFieldType
 {
     SwDoc*          pDoc;
-    SvxExtNumType   nNumberingType;
+    SvxNumType      nNumberingType;
 
 public:
     SwDocStatFieldType(SwDoc*);
-    OUString                Expand(sal_uInt16 nSubType, SvxExtNumType nFormat) const;
+    OUString                Expand(sal_uInt16 nSubType, SvxNumType nFormat) const;
     virtual SwFieldType*    Copy() const override;
 
-    inline void             SetNumFormat( SvxExtNumType eFormat )  { nNumberingType = eFormat; }
+    inline void             SetNumFormat( SvxNumType eFormat )  { nNumberingType = eFormat; }
 };
 
 class SW_DLLPUBLIC SwDocStatField : public SwField
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 5fbbbd3ea82a..35988c4dbccf 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -218,7 +218,7 @@ enum SwDateTimeSubType {
 };
 
 /// General tools.
-OUString  FormatNumber(sal_uInt32 nNum, SvxExtNumType nFormat);
+OUString  FormatNumber(sal_uInt32 nNum, SvxNumType nFormat);
 
 /** Instances of SwFields and those derived from it occur 0 to n times.
  For each class there is one instance of the associated type class.
@@ -278,7 +278,7 @@ private:
     bool                m_bUseFieldValueCache;  /// control the usage of the cached field value
     sal_uInt16          m_nLang;                ///< Always change via SetLanguage!
     bool                m_bIsAutomaticLanguage;
-    sal_uInt32          m_nFormat;              /// this can be either SvxExtNumType or SwChapterFormat depending on the subtype
+    sal_uInt32          m_nFormat;              /// this can be either SvxNumType or SwChapterFormat depending on the subtype
     SwFieldType*        m_pType;
 
     virtual OUString    Expand() const = 0;
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index 30b9ff7640ca..c2bc8cf84efd 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -69,8 +69,8 @@ public:
 
     SwFormatFootnoteEndAtTextEnd & operator=( const SwFormatFootnoteEndAtTextEnd & rAttr );
 
-    SvxExtNumType GetNumType() const        { return aFormat.GetNumberingType(); }
-    void SetNumType( SvxExtNumType eType )  { aFormat.SetNumberingType(eType); }
+    SvxNumType GetNumType() const        { return aFormat.GetNumberingType(); }
+    void SetNumType( SvxNumType eType )  { aFormat.SetNumberingType(eType); }
 
     const SvxNumberType& GetSwNumType() const   { return aFormat; }