convert XML_STYLE_FAMILY to scoped enum

Change-Id: I5335b0190a2f5a8111993c0c9c224c8a6a8f0cfb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88723
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 9 insertions, 7 deletions

diff --git a/xmloff/inc/PageMasterStyleMap.hxx b/xmloff/inc/PageMasterStyleMap.hxx
index e3df3350720d..2230cfacb7d9 100644
--- a/xmloff/inc/PageMasterStyleMap.hxx
+++ b/xmloff/inc/PageMasterStyleMap.hxx
@@ -88,7 +88,7 @@
 // Need own entries for PageMasterStyleMap since these get *filtered*
 // at export time using CTF_PM_FLAGMASK and XML_PM_CTF_START as detector
 // to find the first entry for header/footer (!), see
-// SvXMLAutoStylePoolP_Impl::exportXML, look for XML_STYLE_FAMILY_PAGE_MASTER
+// SvXMLAutoStylePoolP_Impl::exportXML, look for XmlStyleFamily::PAGE_MASTER
 #define CTF_PM_REPEAT_OFFSET_X          (XML_PM_CTF_START + 0x0037)
 #define CTF_PM_REPEAT_OFFSET_Y          (XML_PM_CTF_START + 0x0038)
 #define CTF_PM_FILLGRADIENTNAME         (XML_PM_CTF_START + 0x0039)
diff --git a/xmloff/inc/SchXMLAutoStylePoolP.hxx b/xmloff/inc/SchXMLAutoStylePoolP.hxx
index 55d862ea102b..6e8beb7714f4 100644
--- a/xmloff/inc/SchXMLAutoStylePoolP.hxx
+++ b/xmloff/inc/SchXMLAutoStylePoolP.hxx
@@ -29,7 +29,7 @@ class SchXMLAutoStylePoolP final : public SvXMLAutoStylePoolP
 
     virtual void exportStyleAttributes(
         SvXMLAttributeList& rAttrList,
-        sal_Int32 nFamily,
+        XmlStyleFamily nFamily,
         const ::std::vector< XMLPropertyState >& rProperties,
         const SvXMLExportPropertyMapper& rPropExp
         , const SvXMLUnitConverter& rUnitConverter,
diff --git a/xmloff/inc/StyleMap.hxx b/xmloff/inc/StyleMap.hxx
index 80564882cdde..b6b3249e1eae 100644
--- a/xmloff/inc/StyleMap.hxx
+++ b/xmloff/inc/StyleMap.hxx
@@ -26,13 +26,15 @@
 #include <boost/functional/hash.hpp>
 #include <unordered_map>
 
+enum class XmlStyleFamily;
+
 struct StyleNameKey_Impl
 {
-    sal_uInt16 const m_nFamily;
-    OUString const m_aName;
+    XmlStyleFamily m_nFamily;
+    OUString       m_aName;
 
-    StyleNameKey_Impl( sal_uInt16 nFamily,
-                               const OUString& rName ) :
+    StyleNameKey_Impl( XmlStyleFamily nFamily,
+                       const OUString& rName ) :
         m_nFamily( nFamily ),
         m_aName( rName )
     {
diff --git a/xmloff/inc/XMLChartStyleContext.hxx b/xmloff/inc/XMLChartStyleContext.hxx
index 2e8ba9685c8d..f9c44de4ae12 100644
--- a/xmloff/inc/XMLChartStyleContext.hxx
+++ b/xmloff/inc/XMLChartStyleContext.hxx
@@ -39,7 +39,7 @@ public:
         SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLName,
         const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
-        SvXMLStylesContext& rStyles, sal_uInt16 nFamily );
+        SvXMLStylesContext& rStyles, XmlStyleFamily nFamily );
     virtual ~XMLChartStyleContext() override;
 
     /// is called after all styles have been read to apply styles