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>

8 files changed, 80 insertions, 79 deletions

diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index cb97973995ee..8bee69b3d4f4 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -274,7 +274,7 @@ public:
     SwXMLTextStyleContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx,
             const OUString& rLName,
             const uno::Reference< xml::sax::XAttributeList > & xAttrList,
-            sal_uInt16 nFamily,
+            XmlStyleFamily nFamily,
             SvXMLStylesContext& rStyles );
 
     virtual SvXMLImportContextRef CreateChildContext(
@@ -288,7 +288,7 @@ public:
 uno::Reference < style::XStyle > SwXMLTextStyleContext_Impl::Create()
 {
 
-    if( pConditions && XML_STYLE_FAMILY_TEXT_PARAGRAPH == GetFamily() )
+    if( pConditions && XmlStyleFamily::TEXT_PARAGRAPH == GetFamily() )
     {
         uno::Reference< lang::XMultiServiceFactory > xFactory( GetImport().GetModel(),
                                                     uno::UNO_QUERY );
@@ -312,7 +312,7 @@ void
 SwXMLTextStyleContext_Impl::Finish( bool bOverwrite )
 {
 
-    if( pConditions && XML_STYLE_FAMILY_TEXT_PARAGRAPH == GetFamily() && xNewStyle.is() )
+    if( pConditions && XmlStyleFamily::TEXT_PARAGRAPH == GetFamily() && xNewStyle.is() )
     {
         CommandStruct const*const pCommands = SwCondCollItem::GetCmds();
 
@@ -355,7 +355,7 @@ SwXMLTextStyleContext_Impl::Finish( bool bOverwrite )
 SwXMLTextStyleContext_Impl::SwXMLTextStyleContext_Impl( SwXMLImport& rImport,
         sal_uInt16 nPrfx, const OUString& rLName,
         const uno::Reference< xml::sax::XAttributeList > & xAttrList,
-        sal_uInt16 nFamily,
+        XmlStyleFamily nFamily,
         SvXMLStylesContext& rStyles ) :
     XMLTextStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily )
 {
@@ -425,7 +425,7 @@ public:
             const OUString& rLName,
             const uno::Reference< xml::sax::XAttributeList > & xAttrList,
             SvXMLStylesContext& rStylesC,
-            sal_uInt16 nFamily);
+            XmlStyleFamily nFamily);
 
     virtual void CreateAndInsert( bool bOverwrite ) override;
 
@@ -492,16 +492,16 @@ SvXMLImportContext *SwXMLItemSetStyleContext_Impl::CreateItemSetContext(
     SfxItemPool& rItemPool = pDoc->GetAttrPool();
     switch( GetFamily() )
     {
-    case XML_STYLE_FAMILY_TABLE_TABLE:
+    case XmlStyleFamily::TABLE_TABLE:
         pItemSet.reset( new SfxItemSet( rItemPool, aTableSetRange ) );
         break;
-    case XML_STYLE_FAMILY_TABLE_COLUMN:
+    case XmlStyleFamily::TABLE_COLUMN:
         pItemSet.reset( new SfxItemSet( rItemPool, svl::Items<RES_FRM_SIZE, RES_FRM_SIZE>{} ) );
         break;
-    case XML_STYLE_FAMILY_TABLE_ROW:
+    case XmlStyleFamily::TABLE_ROW:
         pItemSet.reset( new SfxItemSet( rItemPool, aTableLineSetRange ) );
         break;
-    case XML_STYLE_FAMILY_TABLE_CELL:
+    case XmlStyleFamily::TABLE_CELL:
         pItemSet.reset( new SfxItemSet( rItemPool, aTableBoxSetRange ) );
         break;
     default:
@@ -526,7 +526,7 @@ SwXMLItemSetStyleContext_Impl::SwXMLItemSetStyleContext_Impl( SwXMLImport& rImpo
         sal_uInt16 nPrfx, const OUString& rLName,
         const uno::Reference< xml::sax::XAttributeList > & xAttrList,
         SvXMLStylesContext& rStylesC,
-        sal_uInt16 nFamily ) :
+        XmlStyleFamily nFamily ) :
     SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, nFamily ),
     pTextStyle( nullptr ),
     rStyles( rStylesC ),
@@ -569,7 +569,7 @@ SvXMLImportContextRef SwXMLItemSetStyleContext_Impl::CreateChildContext(
                 pTmp->AddAttribute( aStr, GetName() );
                 uno::Reference <xml::sax::XAttributeList> xTmpAttrList = pTmp;
                 pTextStyle = new SwXMLTextStyleContext_Impl( GetSwImport(), nPrefix,
-                                 rLocalName, xTmpAttrList, XML_STYLE_FAMILY_TEXT_PARAGRAPH, rStyles );
+                                 rLocalName, xTmpAttrList, XmlStyleFamily::TEXT_PARAGRAPH, rStyles );
                 pTextStyle->StartElement( xTmpAttrList );
                 rStyles.AddStyle( *pTextStyle );
             }
@@ -594,7 +594,7 @@ void SwXMLItemSetStyleContext_Impl::ConnectPageDesc()
 
     // #i40788# - first determine the display name of the page style,
     // then map this name to the corresponding user interface name.
-    OUString sName = GetImport().GetStyleDisplayName( XML_STYLE_FAMILY_MASTER_PAGE,
+    OUString sName = GetImport().GetStyleDisplayName( XmlStyleFamily::MASTER_PAGE,
                                              sMasterPageName );
     SwStyleNameMapper::FillUIName( sName,
                                    sName,
@@ -684,19 +684,19 @@ protected:
         const OUString& rLocalName,
         const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
 
-    virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily,
+    virtual SvXMLStyleContext *CreateStyleStyleChildContext( XmlStyleFamily nFamily,
         sal_uInt16 nPrefix, const OUString& rLocalName,
         const uno::Reference< xml::sax::XAttributeList > & xAttrList ) override;
     virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext(
-        sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
+        XmlStyleFamily nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
         const uno::Reference< xml::sax::XAttributeList > & xAttrList ) override;
     // HACK
     virtual rtl::Reference < SvXMLImportPropertyMapper > GetImportPropertyMapper(
-        sal_uInt16 nFamily ) const override;
+        XmlStyleFamily nFamily ) const override;
 
     virtual uno::Reference < container::XNameContainer >
-        GetStylesContainer( sal_uInt16 nFamily ) const override;
-    virtual OUString GetServiceName( sal_uInt16 nFamily ) const override;
+        GetStylesContainer( XmlStyleFamily nFamily ) const override;
+    virtual OUString GetServiceName( XmlStyleFamily nFamily ) const override;
     // HACK
 
 public:
@@ -706,7 +706,7 @@ public:
             SwXMLImport& rImport,
             bool bAuto );
 
-    virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const override;
+    virtual bool InsertStyleFamily( XmlStyleFamily nFamily ) const override;
 
     virtual void EndElement() override;
 };
@@ -731,30 +731,30 @@ SvXMLStyleContext *SwXMLStylesContext_Impl::CreateStyleChildContext( sal_uInt16
 }
 
 SvXMLStyleContext *SwXMLStylesContext_Impl::CreateStyleStyleChildContext(
-        sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
+        XmlStyleFamily nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
         const uno::Reference< xml::sax::XAttributeList > & xAttrList )
 {
     SvXMLStyleContext *pStyle = nullptr;
 
     switch( nFamily )
     {
-    case XML_STYLE_FAMILY_TEXT_PARAGRAPH:
+    case XmlStyleFamily::TEXT_PARAGRAPH:
         pStyle = new SwXMLTextStyleContext_Impl( GetSwImport(), nPrefix,
                             rLocalName, xAttrList, nFamily, *this );
         break;
-    case XML_STYLE_FAMILY_TABLE_TABLE:
-    case XML_STYLE_FAMILY_TABLE_COLUMN:
-    case XML_STYLE_FAMILY_TABLE_ROW:
-    case XML_STYLE_FAMILY_TABLE_CELL:
+    case XmlStyleFamily::TABLE_TABLE:
+    case XmlStyleFamily::TABLE_COLUMN:
+    case XmlStyleFamily::TABLE_ROW:
+    case XmlStyleFamily::TABLE_CELL:
         // Distinguish real and automatic styles.
         if (IsAutomaticStyle())
             pStyle = new SwXMLItemSetStyleContext_Impl(GetSwImport(), nPrefix, rLocalName, xAttrList, *this, nFamily);
-        else if (nFamily == XML_STYLE_FAMILY_TABLE_CELL) // Real cell styles are used for table-template import.
+        else if (nFamily == XmlStyleFamily::TABLE_CELL) // Real cell styles are used for table-template import.
             pStyle = new XMLPropStyleContext(GetSwImport(), nPrefix, rLocalName, xAttrList, *this, nFamily);
         else
             SAL_WARN("sw.xml", "Context does not exists for non automatic table, column or row style.");
         break;
-    case XML_STYLE_FAMILY_SD_GRAPHICS_ID:
+    case XmlStyleFamily::SD_GRAPHICS_ID:
         // As long as there are no element items, we can use the text
         // style class.
         pStyle = new XMLTextShapeStyleContext( GetImport(), nPrefix,
@@ -772,21 +772,21 @@ SvXMLStyleContext *SwXMLStylesContext_Impl::CreateStyleStyleChildContext(
 }
 
 SvXMLStyleContext *SwXMLStylesContext_Impl::CreateDefaultStyleStyleChildContext(
-        sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
+        XmlStyleFamily nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
         const uno::Reference< xml::sax::XAttributeList > & xAttrList )
 {
     SvXMLStyleContext *pStyle = nullptr;
 
     switch( nFamily )
     {
-    case XML_STYLE_FAMILY_TEXT_PARAGRAPH:
-    case XML_STYLE_FAMILY_TABLE_TABLE:
-    case XML_STYLE_FAMILY_TABLE_ROW:
+    case XmlStyleFamily::TEXT_PARAGRAPH:
+    case XmlStyleFamily::TABLE_TABLE:
+    case XmlStyleFamily::TABLE_ROW:
         pStyle = new XMLTextStyleContext( GetImport(), nPrefix, rLocalName,
                                           xAttrList, *this, nFamily,
                                           true );
         break;
-    case XML_STYLE_FAMILY_SD_GRAPHICS_ID:
+    case XmlStyleFamily::SD_GRAPHICS_ID:
         // There are no writer specific defaults for graphic styles!
         pStyle = new XMLGraphicsDefaultStyle( GetImport(), nPrefix,
                             rLocalName, xAttrList, *this );
@@ -809,7 +809,7 @@ SwXMLStylesContext_Impl::SwXMLStylesContext_Impl(
 {
 }
 
-bool SwXMLStylesContext_Impl::InsertStyleFamily( sal_uInt16 nFamily ) const
+bool SwXMLStylesContext_Impl::InsertStyleFamily( XmlStyleFamily nFamily ) const
 {
     const SwXMLImport& rSwImport = GetSwImport();
     const SfxStyleFamily nStyleFamilyMask = rSwImport.GetStyleFamilyMask();
@@ -817,23 +817,23 @@ bool SwXMLStylesContext_Impl::InsertStyleFamily( sal_uInt16 nFamily ) const
     bool bIns = true;
     switch( nFamily )
     {
-    case XML_STYLE_FAMILY_TEXT_PARAGRAPH:
+    case XmlStyleFamily::TEXT_PARAGRAPH:
         bIns = bool(nStyleFamilyMask & SfxStyleFamily::Para);
         break;
-    case XML_STYLE_FAMILY_TEXT_TEXT:
+    case XmlStyleFamily::TEXT_TEXT:
         bIns = bool(nStyleFamilyMask & SfxStyleFamily::Char);
         break;
-    case XML_STYLE_FAMILY_SD_GRAPHICS_ID:
+    case XmlStyleFamily::SD_GRAPHICS_ID:
         bIns = bool(nStyleFamilyMask & SfxStyleFamily::Frame);
         break;
-    case XML_STYLE_FAMILY_TEXT_LIST:
+    case XmlStyleFamily::TEXT_LIST:
         bIns = bool(nStyleFamilyMask & SfxStyleFamily::Pseudo);
         break;
-    case XML_STYLE_FAMILY_TEXT_OUTLINE:
-    case XML_STYLE_FAMILY_TEXT_FOOTNOTECONFIG:
-    case XML_STYLE_FAMILY_TEXT_ENDNOTECONFIG:
-    case XML_STYLE_FAMILY_TEXT_LINENUMBERINGCONFIG:
-    case XML_STYLE_FAMILY_TEXT_BIBLIOGRAPHYCONFIG:
+    case XmlStyleFamily::TEXT_OUTLINE:
+    case XmlStyleFamily::TEXT_FOOTNOTECONFIG:
+    case XmlStyleFamily::TEXT_ENDNOTECONFIG:
+    case XmlStyleFamily::TEXT_LINENUMBERINGCONFIG:
+    case XmlStyleFamily::TEXT_BIBLIOGRAPHYCONFIG:
         bIns = !(rSwImport.IsInsertMode() || rSwImport.IsStylesOnlyMode() ||
                  rSwImport.IsBlockMode());
         break;
@@ -846,16 +846,16 @@ bool SwXMLStylesContext_Impl::InsertStyleFamily( sal_uInt16 nFamily ) const
 }
 
 rtl::Reference < SvXMLImportPropertyMapper > SwXMLStylesContext_Impl::GetImportPropertyMapper(
-        sal_uInt16 nFamily ) const
+        XmlStyleFamily nFamily ) const
 {
     rtl::Reference < SvXMLImportPropertyMapper > xMapper;
-    if( nFamily == XML_STYLE_FAMILY_TABLE_TABLE )
+    if( nFamily == XmlStyleFamily::TABLE_TABLE )
         xMapper = XMLTextImportHelper::CreateTableDefaultExtPropMapper(
             const_cast<SwXMLStylesContext_Impl*>( this )->GetImport() );
-    else if( nFamily == XML_STYLE_FAMILY_TABLE_ROW )
+    else if( nFamily == XmlStyleFamily::TABLE_ROW )
         xMapper = XMLTextImportHelper::CreateTableRowDefaultExtPropMapper(
             const_cast<SwXMLStylesContext_Impl*>( this )->GetImport() );
-    else if( nFamily == XML_STYLE_FAMILY_TABLE_CELL )
+    else if( nFamily == XmlStyleFamily::TABLE_CELL )
         xMapper = XMLTextImportHelper::CreateTableCellExtPropMapper(
             const_cast<SwXMLStylesContext_Impl*>( this )->GetImport() );
     else
@@ -864,12 +864,12 @@ rtl::Reference < SvXMLImportPropertyMapper > SwXMLStylesContext_Impl::GetImportP
 }
 
 uno::Reference < container::XNameContainer > SwXMLStylesContext_Impl::GetStylesContainer(
-                                                sal_uInt16 nFamily ) const
+                                                XmlStyleFamily nFamily ) const
 {
     uno::Reference < container::XNameContainer > xStyles;
-    if( XML_STYLE_FAMILY_SD_GRAPHICS_ID == nFamily )
+    if( XmlStyleFamily::SD_GRAPHICS_ID == nFamily )
         xStyles = const_cast<SvXMLImport *>(&GetImport())->GetTextImport()->GetFrameStyles();
-    else if( XML_STYLE_FAMILY_TABLE_CELL == nFamily )
+    else if( XmlStyleFamily::TABLE_CELL == nFamily )
         xStyles = const_cast<SvXMLImport *>(&GetImport())->GetTextImport()->GetCellStyles();
 
     if (!xStyles.is())
@@ -878,11 +878,11 @@ uno::Reference < container::XNameContainer > SwXMLStylesContext_Impl::GetStylesC
     return xStyles;
 }
 
-OUString SwXMLStylesContext_Impl::GetServiceName( sal_uInt16 nFamily ) const
+OUString SwXMLStylesContext_Impl::GetServiceName( XmlStyleFamily nFamily ) const
 {
-    if( XML_STYLE_FAMILY_SD_GRAPHICS_ID == nFamily )
+    if( XmlStyleFamily::SD_GRAPHICS_ID == nFamily )
         return "com.sun.star.style.FrameStyle";
-    else if( XML_STYLE_FAMILY_TABLE_CELL == nFamily )
+    else if( XmlStyleFamily::TABLE_CELL == nFamily )
         return "com.sun.star.style.CellStyle";
 
     return SvXMLStylesContext::GetServiceName( nFamily );
@@ -898,7 +898,7 @@ namespace {
 class SwXMLMasterStylesContext_Impl : public XMLTextMasterStylesContext
 {
 protected:
-    virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const override;
+    virtual bool InsertStyleFamily( XmlStyleFamily nFamily ) const override;
 
     SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); }
     const SwXMLImport& GetSwImport() const
@@ -920,13 +920,13 @@ SwXMLMasterStylesContext_Impl::SwXMLMasterStylesContext_Impl(
 {
 }
 
-bool SwXMLMasterStylesContext_Impl::InsertStyleFamily( sal_uInt16 nFamily ) const
+bool SwXMLMasterStylesContext_Impl::InsertStyleFamily( XmlStyleFamily nFamily ) const
 {
     bool bIns;
 
     const SwXMLImport& rSwImport = GetSwImport();
     const SfxStyleFamily nStyleFamilyMask = rSwImport.GetStyleFamilyMask();
-    if( XML_STYLE_FAMILY_MASTER_PAGE == nFamily )
+    if( XmlStyleFamily::MASTER_PAGE == nFamily )
         bIns = bool(nStyleFamilyMask & SfxStyleFamily::Page);
     else
         bIns = XMLTextMasterStylesContext::InsertStyleFamily( nFamily );
@@ -1014,7 +1014,7 @@ void SwXMLImport::UpdateTextCollConditions( SwDoc *pDoc )
 }
 
 bool SwXMLImport::FindAutomaticStyle(
-        sal_uInt16 nFamily,
+        XmlStyleFamily nFamily,
         const OUString& rName,
         const SfxItemSet **ppItemSet ) const
 {
@@ -1029,14 +1029,14 @@ bool SwXMLImport::FindAutomaticStyle(
         {
             if( ppItemSet )
             {
-                if( XML_STYLE_FAMILY_TABLE_TABLE == pStyle->GetFamily() &&
+                if( XmlStyleFamily::TABLE_TABLE == pStyle->GetFamily() &&
                     pStyle->HasMasterPageName() &&
                     !pStyle->IsPageDescConnected() )
                     pStyle->ConnectPageDesc();
                 (*ppItemSet) = pStyle->GetItemSet();
 
                 // resolve data style name late
-                if( XML_STYLE_FAMILY_TABLE_CELL == pStyle->GetFamily() &&
+                if( XmlStyleFamily::TABLE_CELL == pStyle->GetFamily() &&
                     pStyle->ResolveDataStyleName() )
                 {
                     (*ppItemSet) = pStyle->GetItemSet();
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index 485bf87e764e..ec3f00f60caa 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -269,7 +269,7 @@ protected:
 
     virtual void exportStyleAttributes(
             SvXMLAttributeList& rAttrList,
-            sal_Int32 nFamily,
+            XmlStyleFamily nFamily,
             const std::vector< XMLPropertyState >& rProperties,
             const SvXMLExportPropertyMapper& rPropExp
             , const SvXMLUnitConverter& rUnitConverter,
@@ -284,7 +284,7 @@ public:
 
 void SwXMLAutoStylePoolP::exportStyleAttributes(
             SvXMLAttributeList& rAttrList,
-            sal_Int32 nFamily,
+            XmlStyleFamily nFamily,
             const std::vector< XMLPropertyState >& rProperties,
             const SvXMLExportPropertyMapper& rPropExp
             , const SvXMLUnitConverter& rUnitConverter,
@@ -293,7 +293,7 @@ void SwXMLAutoStylePoolP::exportStyleAttributes(
 {
     SvXMLAutoStylePoolP::exportStyleAttributes( rAttrList, nFamily, rProperties, rPropExp, rUnitConverter, rNamespaceMap);
 
-    if( XML_STYLE_FAMILY_TEXT_PARAGRAPH == nFamily )
+    if( XmlStyleFamily::TEXT_PARAGRAPH == nFamily )
     {
         for( const auto& rProperty : rProperties )
         {
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 3373607993c3..01b22fef1c3a 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -150,11 +150,11 @@ SwXMLBodyContext_Impl::SwXMLBodyContext_Impl( SwXMLImport& rImport ) :
             rImport.GetTextImport()->GetTextStyles());
     if (!xStyles->hasByName("Default"))
     {   // this old name was used before LO 4.0
-        rImport.AddStyleDisplayName(XML_STYLE_FAMILY_TEXT_TEXT, "Default", sDefault);
+        rImport.AddStyleDisplayName(XmlStyleFamily::TEXT_TEXT, "Default", sDefault);
     }
     if (!xStyles->hasByName("Default_20_Style"))
     {   // this new name contains a space which is converted to _20_ on export
-        rImport.AddStyleDisplayName(XML_STYLE_FAMILY_TEXT_TEXT, "Default_20_Style", sDefault);
+        rImport.AddStyleDisplayName(XmlStyleFamily::TEXT_TEXT, "Default_20_Style", sDefault);
     }
     bool isEncoded(false);
     OUString const defaultEncoded(
@@ -162,7 +162,7 @@ SwXMLBodyContext_Impl::SwXMLBodyContext_Impl( SwXMLImport& rImport ) :
     if (isEncoded && defaultEncoded != "Default_20_Style"
         && !xStyles->hasByName(defaultEncoded))
     {   // new name may contain a space which is converted to _20_ on export
-        rImport.AddStyleDisplayName(XML_STYLE_FAMILY_TEXT_TEXT, defaultEncoded, sDefault);
+        rImport.AddStyleDisplayName(XmlStyleFamily::TEXT_TEXT, defaultEncoded, sDefault);
     }
 }
 
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index b06f43d0168a..4b62c408b97b 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -149,13 +149,13 @@ public:
     SvXMLImportContext *CreateTableItemImportContext( sal_uInt16 nPrefix,
                 const OUString& rLocalName,
                 const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
-                sal_uInt16 nSubFamily, SfxItemSet& rItemSet );
+                XmlStyleFamily nSubFamily, SfxItemSet& rItemSet );
 
     const SvXMLTokenMap& GetDocElemTokenMap();
     const SvXMLTokenMap& GetTableElemTokenMap();
     const SvXMLTokenMap& GetTableCellAttrTokenMap();
 
-    bool FindAutomaticStyle( sal_uInt16 nFamily,
+    bool FindAutomaticStyle( XmlStyleFamily nFamily,
                              const OUString& rName,
                              const SfxItemSet **ppItemSet ) const;
     void MergeListsAtDocumentInsertPosition(SwDoc *pDoc);
diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx
index 097786f3b576..9c1c8abb0885 100644
--- a/sw/source/filter/xml/xmlitemi.cxx
+++ b/sw/source/filter/xml/xmlitemi.cxx
@@ -337,25 +337,26 @@ SvXMLImportContext *SwXMLImport::CreateTableItemImportContext(
                   sal_uInt16 nPrefix,
                   const OUString& rLocalName,
                   const Reference< xml::sax::XAttributeList > & xAttrList,
-                  sal_uInt16 nFamily,
+                  XmlStyleFamily nFamily,
                   SfxItemSet& rItemSet )
 {
     SvXMLItemMapEntriesRef xItemMap;
 
     switch( nFamily )
     {
-    case XML_STYLE_FAMILY_TABLE_TABLE:
+    case XmlStyleFamily::TABLE_TABLE:
         xItemMap = m_xTableItemMap;
         break;
-    case XML_STYLE_FAMILY_TABLE_COLUMN:
+    case XmlStyleFamily::TABLE_COLUMN:
         xItemMap = m_xTableColItemMap;
         break;
-    case XML_STYLE_FAMILY_TABLE_ROW:
+    case XmlStyleFamily::TABLE_ROW:
         xItemMap = m_xTableRowItemMap;
         break;
-    case XML_STYLE_FAMILY_TABLE_CELL:
+    case XmlStyleFamily::TABLE_CELL:
         xItemMap = m_xTableCellItemMap;
         break;
+    default: break;
     }
 
     m_pTableItemMapper->setMapEntries( xItemMap );
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index d49f23a76ff6..184047f4b622 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -779,7 +779,7 @@ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl(
         const SfxPoolItem *pItem;
         const SfxItemSet *pAutoItemSet = nullptr;
         if( GetSwImport().FindAutomaticStyle(
-                    XML_STYLE_FAMILY_TABLE_COLUMN,
+                    XmlStyleFamily::TABLE_COLUMN,
                                               aStyleName, &pAutoItemSet ) &&
             pAutoItemSet &&
             SfxItemState::SET == pAutoItemSet->GetItemState( RES_FRM_SIZE, false,
@@ -1988,7 +1988,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox(
         const SfxItemSet *pAutoItemSet = nullptr;
         if( pCell->GetStartNode() && !sStyleName.isEmpty() &&
             GetSwImport().FindAutomaticStyle(
-                XML_STYLE_FAMILY_TABLE_CELL, sStyleName, &pAutoItemSet ) )
+                XmlStyleFamily::TABLE_CELL, sStyleName, &pAutoItemSet ) )
         {
             if( pAutoItemSet )
                 pBoxFormat2->SetFormatAttr( *pAutoItemSet );
@@ -2150,7 +2150,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
     if( 1 == (nBottomRow - nTopRow) &&
         !rStyleName.isEmpty() &&
         GetSwImport().FindAutomaticStyle(
-            XML_STYLE_FAMILY_TABLE_ROW, rStyleName, &pAutoItemSet ) )
+            XmlStyleFamily::TABLE_ROW, rStyleName, &pAutoItemSet ) )
     {
         if( pAutoItemSet )
             pFrameFormat->SetFormatAttr( *pAutoItemSet );
@@ -2623,7 +2623,7 @@ void SwXMLTableContext::MakeTable()
     const SfxItemSet *pAutoItemSet = nullptr;
     if( !m_aStyleName.isEmpty() &&
         rSwImport.FindAutomaticStyle(
-            XML_STYLE_FAMILY_TABLE_TABLE, m_aStyleName, &pAutoItemSet ) &&
+            XmlStyleFamily::TABLE_TABLE, m_aStyleName, &pAutoItemSet ) &&
          pAutoItemSet )
     {
         const SfxPoolItem *pItem;
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 13f41c7b45f9..7645de3723ac 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -229,7 +229,7 @@ void SwXMLTextParagraphExport::_collectTextEmbeddedAutoStyles(
     lcl_addAspect( rObjRef, aStates,
            GetAutoFramePropMapper()->getPropertySetMapper() );
 
-    Add( XML_STYLE_FAMILY_TEXT_FRAME, rPropSet, aStates );
+    Add( XmlStyleFamily::TEXT_FRAME, rPropSet, aStates );
 
     const XMLPropertyState **pStates = aStates;
     while( *pStates )
@@ -299,7 +299,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
     lcl_addAspect( rObjRef, aStates,
         GetAutoFramePropMapper()->getPropertySetMapper() );
 
-    const OUString sAutoStyle = Find( XML_STYLE_FAMILY_TEXT_FRAME,
+    const OUString sAutoStyle = Find( XmlStyleFamily::TEXT_FRAME,
                                       rPropSet, sStyle, aStates );
     const XMLPropertyState **pStates = aStates;
     while( *pStates )
diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx
index 9ebbd37f3375..d5f69b2fe7c4 100644
--- a/sw/source/uibase/config/StoredChapterNumbering.cxx
+++ b/sw/source/uibase/config/StoredChapterNumbering.cxx
@@ -275,7 +275,7 @@ public:
     {
         OUString name;
         OUString displayName;
-        sal_uInt16 nFamily(0);
+        XmlStyleFamily nFamily(XmlStyleFamily::DATA_STYLE);
 
         sax_fastparser::FastAttributeList *pAttribList =
             sax_fastparser::FastAttributeList::castToFastAttributeList( xAttrList );
@@ -284,14 +284,14 @@ public:
             if (aIter.getToken() == (XML_NAMESPACE_STYLE | XML_FAMILY))
             {
                 if (IsXMLToken(aIter.toString(), XML_TEXT))
-                    nFamily = XML_STYLE_FAMILY_TEXT_TEXT;
+                    nFamily = XmlStyleFamily::TEXT_TEXT;
                 else if (IsXMLToken(aIter.toString(), XML_NAME))
                     name = aIter.toString();
                 else if (IsXMLToken(aIter.toString(), XML_DISPLAY_NAME))
                     displayName = aIter.toString();
             }
 
-        if (nFamily && !name.isEmpty() && !displayName.isEmpty())
+        if (nFamily != XmlStyleFamily::DATA_STYLE && !name.isEmpty() && !displayName.isEmpty())
         {
             rImport.AddStyleDisplayName(nFamily, name, displayName);
         }