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>

10 files changed, 83 insertions, 79 deletions

diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
index dc0b67f4ad9b..432b7538fa80 100644
--- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
+++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
@@ -49,7 +49,7 @@ using ::xmloff::token::XML_PARAGRAPH_PROPERTIES;
 
 
 XMLGraphicsDefaultStyle::XMLGraphicsDefaultStyle( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList, SvXMLStylesContext& rStyles )
-: XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, XML_STYLE_FAMILY_SD_GRAPHICS_ID, true )
+: XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, XmlStyleFamily::SD_GRAPHICS_ID, true )
 {
 }
 
diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx
index b301986afde1..b7036dd5df4e 100644
--- a/xmloff/source/draw/XMLShapeStyleContext.cxx
+++ b/xmloff/source/draw/XMLShapeStyleContext.cxx
@@ -54,7 +54,7 @@ XMLShapeStyleContext::XMLShapeStyleContext(
     const OUString& rLName,
     const uno::Reference< xml::sax::XAttributeList >& xAttrList,
     SvXMLStylesContext& rStyles,
-    sal_uInt16 nFamily)
+    XmlStyleFamily nFamily)
 :   XMLPropStyleContext(rImport, nPrfx, rLName, xAttrList, rStyles, nFamily ),
     m_bIsNumRuleAlreadyConverted( false )
 {
@@ -199,15 +199,15 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet
         { CTF_SD_OLE_VIS_AREA_IMPORT_HEIGHT, -1 },
         { -1, -1 }
     };
-    static const sal_uInt16 aFamilies[] =
+    static const XmlStyleFamily aFamilies[] =
     {
-        XML_STYLE_FAMILY_SD_STROKE_DASH_ID,
-        XML_STYLE_FAMILY_SD_MARKER_ID,
-        XML_STYLE_FAMILY_SD_MARKER_ID,
-        XML_STYLE_FAMILY_SD_GRADIENT_ID,
-        XML_STYLE_FAMILY_SD_GRADIENT_ID,
-        XML_STYLE_FAMILY_SD_HATCH_ID,
-        XML_STYLE_FAMILY_SD_FILL_IMAGE_ID
+        XmlStyleFamily::SD_STROKE_DASH_ID,
+        XmlStyleFamily::SD_MARKER_ID,
+        XmlStyleFamily::SD_MARKER_ID,
+        XmlStyleFamily::SD_GRADIENT_ID,
+        XmlStyleFamily::SD_GRADIENT_ID,
+        XmlStyleFamily::SD_HATCH_ID,
+        XmlStyleFamily::SD_FILL_IMAGE_ID
     };
 
     rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap =
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 9471c10db1f7..48a8837fbfb0 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -412,17 +412,17 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent
 
     // add family name
     GetAutoStylePool()->AddFamily(
-        XML_STYLE_FAMILY_SD_GRAPHICS_ID,
+        XmlStyleFamily::SD_GRAPHICS_ID,
         OUString(XML_STYLE_FAMILY_SD_GRAPHICS_NAME),
           GetPropertySetMapper(),
           OUString(XML_STYLE_FAMILY_SD_GRAPHICS_PREFIX));
     GetAutoStylePool()->AddFamily(
-        XML_STYLE_FAMILY_SD_PRESENTATION_ID,
+        XmlStyleFamily::SD_PRESENTATION_ID,
         OUString(XML_STYLE_FAMILY_SD_PRESENTATION_NAME),
           GetPropertySetMapper(),
           OUString(XML_STYLE_FAMILY_SD_PRESENTATION_PREFIX));
     GetAutoStylePool()->AddFamily(
-        XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID,
+        XmlStyleFamily::SD_DRAWINGPAGE_ID,
         OUString(XML_STYLE_FAMILY_SD_DRAWINGPAGE_NAME),
           GetPresPagePropsMapper(),
           OUString(XML_STYLE_FAMILY_SD_DRAWINGPAGE_PREFIX));
@@ -1532,12 +1532,12 @@ OUString SdXMLExport::ImpCreatePresPageStyleName( const Reference<XDrawPage>& xD
         {
             // there are filtered properties -> hard attributes
             // try to find this style in AutoStylePool
-            sStyleName = GetAutoStylePool()->Find(XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID, sStyleName, aPropStates);
+            sStyleName = GetAutoStylePool()->Find(XmlStyleFamily::SD_DRAWINGPAGE_ID, sStyleName, aPropStates);
 
             if(sStyleName.isEmpty())
             {
                 // Style did not exist, add it to AutoStalePool
-                sStyleName = GetAutoStylePool()->Add(XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID, sStyleName, aPropStates);
+                sStyleName = GetAutoStylePool()->Add(XmlStyleFamily::SD_DRAWINGPAGE_ID, sStyleName, aPropStates);
             }
         }
     }
@@ -1596,7 +1596,7 @@ void SdXMLExport::ImpWritePresentationStyles()
                     aStEx->exportStyleFamily(xNamed->getName(),
                         OUString(XML_STYLE_FAMILY_SD_PRESENTATION_NAME),
                         aMapperRef, false,
-                        XML_STYLE_FAMILY_SD_PRESENTATION_ID, &aPrefix);
+                        XmlStyleFamily::SD_PRESENTATION_ID, &aPrefix);
                 }
             }
         }
@@ -2202,7 +2202,7 @@ void SdXMLExport::ExportAutoStyles_()
     }
 
     // export draw-page styles
-    GetAutoStylePool()->exportXML( XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID );
+    GetAutoStylePool()->exportXML( XmlStyleFamily::SD_DRAWINGPAGE_ID );
 
     exportAutoDataStyles();
 
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index affbfd01a779..5eac15c7cbf7 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -191,12 +191,12 @@ XMLShapeExport::XMLShapeExport(SvXMLExport& rExp,
 */
 
     mrExport.GetAutoStylePool()->AddFamily(
-        XML_STYLE_FAMILY_SD_GRAPHICS_ID,
+        XmlStyleFamily::SD_GRAPHICS_ID,
         XML_STYLE_FAMILY_SD_GRAPHICS_NAME,
         GetPropertySetMapper(),
         XML_STYLE_FAMILY_SD_GRAPHICS_PREFIX);
     mrExport.GetAutoStylePool()->AddFamily(
-        XML_STYLE_FAMILY_SD_PRESENTATION_ID,
+        XmlStyleFamily::SD_PRESENTATION_ID,
         XML_STYLE_FAMILY_SD_PRESENTATION_NAME,
         GetPropertySetMapper(),
         XML_STYLE_FAMILY_SD_PRESENTATION_PREFIX);
@@ -359,7 +359,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
                         OUString aFamilyName;
                         xStylePropSet->getPropertyValue("Family") >>= aFamilyName;
                         if( !aFamilyName.isEmpty() && aFamilyName != "graphics" )
-                            aShapeInfo.mnFamily = XML_STYLE_FAMILY_SD_PRESENTATION_ID;
+                            aShapeInfo.mnFamily = XmlStyleFamily::SD_PRESENTATION_ID;
                     }
                 }
                 catch(const beans::UnknownPropertyException&)
@@ -370,7 +370,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
                 }
 
                 // get parent-style name
-                if(XML_STYLE_FAMILY_SD_PRESENTATION_ID == aShapeInfo.mnFamily)
+                if(XmlStyleFamily::SD_PRESENTATION_ID == aShapeInfo.mnFamily)
                 {
                     aParentName = msPresentationStylePrefix;
                 }
@@ -491,11 +491,11 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
 
             if( nCount )
             {
-                aShapeInfo.msTextStyleName = mrExport.GetAutoStylePool()->Find( XML_STYLE_FAMILY_TEXT_PARAGRAPH, "", aPropStates );
+                aShapeInfo.msTextStyleName = mrExport.GetAutoStylePool()->Find( XmlStyleFamily::TEXT_PARAGRAPH, "", aPropStates );
                 if(aShapeInfo.msTextStyleName.isEmpty())
                 {
                     // Style did not exist, add it to AutoStalePool
-                    aShapeInfo.msTextStyleName = mrExport.GetAutoStylePool()->Add(XML_STYLE_FAMILY_TEXT_PARAGRAPH, "", aPropStates);
+                    aShapeInfo.msTextStyleName = mrExport.GetAutoStylePool()->Add(XmlStyleFamily::TEXT_PARAGRAPH, "", aPropStates);
                 }
             }
         }
@@ -683,7 +683,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
     // export style name
     if( !aShapeInfo.msStyleName.isEmpty() )
     {
-        if(XML_STYLE_FAMILY_SD_GRAPHICS_ID == aShapeInfo.mnFamily)
+        if(XmlStyleFamily::SD_GRAPHICS_ID == aShapeInfo.mnFamily)
             mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_STYLE_NAME, mrExport.EncodeStyleName( aShapeInfo.msStyleName) );
         else
             mrExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_STYLE_NAME, mrExport.EncodeStyleName( aShapeInfo.msStyleName) );
@@ -1023,12 +1023,12 @@ void XMLShapeExport::exportAutoStyles()
 
     // ...for graphic
     {
-        GetExport().GetAutoStylePool()->exportXML( XML_STYLE_FAMILY_SD_GRAPHICS_ID );
+        GetExport().GetAutoStylePool()->exportXML( XmlStyleFamily::SD_GRAPHICS_ID );
     }
 
     // ...for presentation
     {
-        GetExport().GetAutoStylePool()->exportXML( XML_STYLE_FAMILY_SD_PRESENTATION_ID );
+        GetExport().GetAutoStylePool()->exportXML( XmlStyleFamily::SD_PRESENTATION_ID );
     }
 
     if( mxShapeTableExport.is() )
@@ -1338,7 +1338,7 @@ void XMLShapeExport::ExportGraphicDefaults()
                 aStEx->exportDefaultStyle( xDefaults, XML_STYLE_FAMILY_SD_GRAPHICS_NAME, xPropertySetMapper );
 
                 // write graphic family styles
-                aStEx->exportStyleFamily("graphics", OUString(XML_STYLE_FAMILY_SD_GRAPHICS_NAME), xPropertySetMapper, false, XML_STYLE_FAMILY_SD_GRAPHICS_ID);
+                aStEx->exportStyleFamily("graphics", OUString(XML_STYLE_FAMILY_SD_GRAPHICS_NAME), xPropertySetMapper, false, XmlStyleFamily::SD_GRAPHICS_ID);
             }
         }
         catch(const lang::ServiceNotRegisteredException&)
diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx
index f99346709dbe..40efe2d0797b 100644
--- a/xmloff/source/draw/ximpbody.cxx
+++ b/xmloff/source/draw/ximpbody.cxx
@@ -152,7 +152,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
         {
             bool bDone(false);
             OUString sDisplayName( rImport.GetStyleDisplayName(
-                            XML_STYLE_FAMILY_MASTER_PAGE, maMasterPageName ) );
+                            XmlStyleFamily::MASTER_PAGE, maMasterPageName ) );
 
             for(sal_Int32 a = 0; !bDone && a < xMasterPages->getCount(); a++)
             {
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index 4eff47a38f9c..e56e9ac9359e 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -328,7 +328,7 @@ void SdXMLGenericPageContext::EndElement()
                         if( pStyles )
                         {
                             const SdXMLNumberFormatImportContext* pSdNumStyle =
-                                dynamic_cast< const SdXMLNumberFormatImportContext* >( pStyles->FindStyleChildContext( XML_STYLE_FAMILY_DATA_STYLE, aDateTimeFormat, true ) );
+                                dynamic_cast< const SdXMLNumberFormatImportContext* >( pStyles->FindStyleChildContext( XmlStyleFamily::DATA_STYLE, aDateTimeFormat, true ) );
 
                             if( pSdNumStyle )
                             {
@@ -361,7 +361,7 @@ void SdXMLGenericPageContext::SetStyle( OUString const & rStyleName )
             if (const SdXMLStylesContext* pStyles = dynamic_cast<const SdXMLStylesContext *>(pContext))
             {
                 const SvXMLStyleContext* pStyle = pStyles->FindStyleChildContext(
-                    XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID, rStyleName);
+                    XmlStyleFamily::SD_DRAWINGPAGE_ID, rStyleName);
 
                 if (const XMLPropStyleContext* pPropStyle = dynamic_cast<const XMLPropStyleContext*>(pStyle))
                 {
@@ -417,7 +417,7 @@ void SdXMLGenericPageContext::SetLayout()
 
         if (const SdXMLStylesContext* pStyles = dynamic_cast<const SdXMLStylesContext *>(pContext))
         {
-            const SvXMLStyleContext* pStyle = pStyles->FindStyleChildContext( XML_STYLE_FAMILY_SD_PRESENTATIONPAGELAYOUT_ID, maPageLayoutName);
+            const SvXMLStyleContext* pStyle = pStyles->FindStyleChildContext( XmlStyleFamily::SD_PRESENTATIONPAGELAYOUT_ID, maPageLayoutName);
 
             if (const SdXMLPresentationPageLayoutContext* pLayout = dynamic_cast<const SdXMLPresentationPageLayoutContext*>(pStyle))
             {
@@ -477,7 +477,7 @@ void SdXMLGenericPageContext::SetPageMaster( OUString const & rsPageMasterName )
         // #80012# GetStylesContext() replaced with GetAutoStylesContext()
         const SvXMLStylesContext* pAutoStyles = GetSdImport().GetShapeImport()->GetAutoStylesContext();
 
-        const SvXMLStyleContext* pStyle = pAutoStyles ? pAutoStyles->FindStyleChildContext(XML_STYLE_FAMILY_SD_PAGEMASTERCONEXT_ID, rsPageMasterName) : nullptr;
+        const SvXMLStyleContext* pStyle = pAutoStyles ? pAutoStyles->FindStyleChildContext(XmlStyleFamily::SD_PAGEMASTERCONEXT_ID, rsPageMasterName) : nullptr;
 
         if (const SdXMLPageMasterContext* pPageMaster = dynamic_cast<const SdXMLPageMasterContext*>(pStyle))
         {
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 76f534a9819b..419c0174ae81 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -149,7 +149,7 @@ SdXMLShapeContext::SdXMLShapeContext(
     , mxShapes( rShapes )
     , mxAttrList(xAttrList)
     , mbListContextPushed( false )
-    , mnStyleFamily(XML_STYLE_FAMILY_SD_GRAPHICS_ID)
+    , mnStyleFamily(XmlStyleFamily::SD_GRAPHICS_ID)
     , mbIsPlaceholder(false)
     , mbClearDefaultAttributes( true )
     , mbIsUserTransformed(false)
@@ -665,10 +665,10 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */)
 
                             uno::Reference< container::XNameAccess > xFamily;
 
-                            if( XML_STYLE_FAMILY_SD_PRESENTATION_ID == mnStyleFamily )
+                            if( XmlStyleFamily::SD_PRESENTATION_ID == mnStyleFamily )
                             {
                                 aStyleName = GetImport().GetStyleDisplayName(
-                                    XML_STYLE_FAMILY_SD_PRESENTATION_ID,
+                                    XmlStyleFamily::SD_PRESENTATION_ID,
                                     aStyleName );
                                 sal_Int32 nPos = aStyleName.lastIndexOf( '-' );
                                 if( -1 != nPos )
@@ -684,7 +684,7 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */)
                                 // get graphics family
                                 xFamilies->getByName("graphics") >>= xFamily;
                                 aStyleName = GetImport().GetStyleDisplayName(
-                                    XML_STYLE_FAMILY_SD_GRAPHICS_ID,
+                                    XmlStyleFamily::SD_GRAPHICS_ID,
                                     aStyleName );
                             }
 
@@ -740,7 +740,7 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */)
             if( nullptr == GetImport().GetShapeImport()->GetAutoStylesContext())
                 break;
 
-            const SvXMLStyleContext* pTempStyle = GetImport().GetShapeImport()->GetAutoStylesContext()->FindStyleChildContext(XML_STYLE_FAMILY_TEXT_PARAGRAPH, maTextStyleName);
+            const SvXMLStyleContext* pTempStyle = GetImport().GetShapeImport()->GetAutoStylesContext()->FindStyleChildContext(XmlStyleFamily::TEXT_PARAGRAPH, maTextStyleName);
             XMLPropStyleContext* pStyle = const_cast<XMLPropStyleContext*>(dynamic_cast<const XMLPropStyleContext*>( pTempStyle ) ); // use temp var, PTR_CAST is a bad macro, FindStyleChildContext will be called twice
             if( pStyle == nullptr )
                 break;
@@ -858,7 +858,7 @@ void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rL
         else if( IsXMLToken( rLocalName, XML_STYLE_NAME ) )
         {
             maDrawStyleName = rValue;
-            mnStyleFamily = XML_STYLE_FAMILY_SD_PRESENTATION_ID;
+            mnStyleFamily = XmlStyleFamily::SD_PRESENTATION_ID;
         }
     }
     else if( XML_NAMESPACE_SVG == nPrefix )
@@ -926,7 +926,7 @@ bool SdXMLShapeContext::isPresentationShape() const
 {
     if( !maPresentationClass.isEmpty() && const_cast<SdXMLShapeContext*>(this)->GetImport().GetShapeImport()->IsPresentationShapesSupported() )
     {
-        if(XML_STYLE_FAMILY_SD_PRESENTATION_ID == mnStyleFamily)
+        if(XmlStyleFamily::SD_PRESENTATION_ID == mnStyleFamily)
         {
             return true;
         }
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index fae45f88f00a..5231163429c9 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -61,7 +61,7 @@ protected:
     /// whether to restore list context (#91964#)
     bool                        mbListContextPushed;
 
-    sal_uInt16                  mnStyleFamily;
+    XmlStyleFamily              mnStyleFamily;
     bool                    mbIsPlaceholder;
     bool                        mbClearDefaultAttributes;
     bool                    mbIsUserTransformed;
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index e1fc43066ddf..136713271f8d 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -139,7 +139,7 @@ public:
         const OUString& rLName,
         const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
         SvXMLStylesContext& rStyles,
-        sal_uInt16 nFamily = XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID);
+        XmlStyleFamily nFamily = XmlStyleFamily::SD_DRAWINGPAGE_ID);
 
     SvXMLImportContextRef CreateChildContext(
         sal_uInt16 nPrefix,
@@ -160,7 +160,7 @@ SdXMLDrawingPageStyleContext::SdXMLDrawingPageStyleContext(
     const OUString& rLName,
     const uno::Reference< xml::sax::XAttributeList >& xAttrList,
     SvXMLStylesContext& rStyles,
-    sal_uInt16 nFamily)
+    XmlStyleFamily nFamily)
 :   XMLPropStyleContext(rImport, nPrfx, rLName, xAttrList, rStyles, nFamily )
 {
 }
@@ -216,7 +216,7 @@ void SdXMLDrawingPageStyleContext::Finish( bool bOverwrite )
 
                 const SdXMLNumberFormatImportContext* pSdNumStyle =
                     dynamic_cast< const SdXMLNumberFormatImportContext*> (
-                        GetStyles()->FindStyleChildContext( XML_STYLE_FAMILY_DATA_STYLE, sStyleName, true ) );
+                        GetStyles()->FindStyleChildContext( XmlStyleFamily::DATA_STYLE, sStyleName, true ) );
 
                 if( pSdNumStyle )
                     nStyle = pSdNumStyle->GetDrawKey();
@@ -245,15 +245,15 @@ void SdXMLDrawingPageStyleContext::FillPropertySet(
         { CTF_FILLBITMAPNAME , -1 },
         { -1, -1 }
     };
-    static const sal_uInt16 aFamilies[MAX_SPECIAL_DRAW_STYLES] =
+    static const XmlStyleFamily aFamilies[MAX_SPECIAL_DRAW_STYLES] =
     {
-        XML_STYLE_FAMILY_SD_STROKE_DASH_ID,
-        XML_STYLE_FAMILY_SD_MARKER_ID,
-        XML_STYLE_FAMILY_SD_MARKER_ID,
-        XML_STYLE_FAMILY_SD_GRADIENT_ID,
-        XML_STYLE_FAMILY_SD_GRADIENT_ID,
-        XML_STYLE_FAMILY_SD_HATCH_ID,
-        XML_STYLE_FAMILY_SD_FILL_IMAGE_ID
+        XmlStyleFamily::SD_STROKE_DASH_ID,
+        XmlStyleFamily::SD_MARKER_ID,
+        XmlStyleFamily::SD_MARKER_ID,
+        XmlStyleFamily::SD_GRADIENT_ID,
+        XmlStyleFamily::SD_GRADIENT_ID,
+        XmlStyleFamily::SD_HATCH_ID,
+        XmlStyleFamily::SD_FILL_IMAGE_ID
     };
 
     rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap =
@@ -296,7 +296,7 @@ SdXMLPageMasterStyleContext::SdXMLPageMasterStyleContext(
     sal_uInt16 nPrfx,
     const OUString& rLName,
     const uno::Reference< xml::sax::XAttributeList>& xAttrList)
-:   SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_SD_PAGEMASTERSTYLECONEXT_ID),
+:   SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList, XmlStyleFamily::SD_PAGEMASTERSTYLECONEXT_ID),
     mnBorderBottom( 0 ),
     mnBorderLeft( 0 ),
     mnBorderRight( 0 ),
@@ -377,7 +377,7 @@ SdXMLPageMasterContext::SdXMLPageMasterContext(
     sal_uInt16 nPrfx,
     const OUString& rLName,
     const uno::Reference< xml::sax::XAttributeList>& xAttrList)
-:   SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_SD_PAGEMASTERCONEXT_ID)
+:   SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList, XmlStyleFamily::SD_PAGEMASTERCONEXT_ID)
 {
     // set family to something special at SvXMLStyleContext
     // for differences in search-methods
@@ -426,7 +426,7 @@ SdXMLPresentationPageLayoutContext::SdXMLPresentationPageLayoutContext(
     sal_uInt16 nPrfx,
     const OUString& rLName,
     const uno::Reference< xml::sax::XAttributeList >& xAttrList)
-:   SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_SD_PRESENTATIONPAGELAYOUT_ID),
+:   SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList, XmlStyleFamily::SD_PRESENTATIONPAGELAYOUT_ID),
     mnTypeId( AUTOLAYOUT_NONE )
 {
     // set family to something special at SvXMLStyleContext
@@ -783,7 +783,7 @@ SdXMLMasterPageContext::SdXMLMasterPageContext(
     if( msDisplayName.isEmpty() )
         msDisplayName = msName;
     else if( msDisplayName != msName )
-        GetImport().AddStyleDisplayName( XML_STYLE_FAMILY_MASTER_PAGE, msName, msDisplayName );
+        GetImport().AddStyleDisplayName( XmlStyleFamily::MASTER_PAGE, msName, msDisplayName );
 
     GetImport().GetShapeImport()->startPage( GetLocalShapesContext() );
 
@@ -845,7 +845,7 @@ SvXMLImportContextRef SdXMLMasterPageContext::CreateChildContext(
                 XMLShapeStyleContext* pNew = new XMLShapeStyleContext(
                     GetSdImport(), nPrefix, rLocalName, xAttrList,
                     *GetSdImport().GetShapeImport()->GetStylesContext(),
-                    XML_STYLE_FAMILY_SD_PRESENTATION_ID);
+                    XmlStyleFamily::SD_PRESENTATION_ID);
 
                 // add this style to the outer StylesContext class for later processing
                 xContext = pNew;
@@ -960,7 +960,7 @@ SvXMLStyleContext* SdXMLStylesContext::CreateStyleChildContext(
 }
 
 SvXMLStyleContext* SdXMLStylesContext::CreateStyleStyleChildContext(
-    sal_uInt16 nFamily,
+    XmlStyleFamily nFamily,
     sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const uno::Reference< css::xml::sax::XAttributeList >& xAttrList)
@@ -969,14 +969,15 @@ SvXMLStyleContext* SdXMLStylesContext::CreateStyleStyleChildContext(
 
     switch( nFamily )
     {
-    case XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID:
+    case XmlStyleFamily::SD_DRAWINGPAGE_ID:
         pContext = new SdXMLDrawingPageStyleContext(GetSdImport(), nPrefix, rLocalName, xAttrList, *this );
         break;
-    case XML_STYLE_FAMILY_TABLE_CELL:
-    case XML_STYLE_FAMILY_TABLE_COLUMN:
-    case XML_STYLE_FAMILY_TABLE_ROW:
+    case XmlStyleFamily::TABLE_CELL:
+    case XmlStyleFamily::TABLE_COLUMN:
+    case XmlStyleFamily::TABLE_ROW:
         pContext = new XMLShapeStyleContext( GetSdImport(), nPrefix, rLocalName, xAttrList, *this, nFamily );
         break;
+    default: break;
     }
 
     // call base class
@@ -987,7 +988,7 @@ SvXMLStyleContext* SdXMLStylesContext::CreateStyleStyleChildContext(
 }
 
 SvXMLStyleContext* SdXMLStylesContext::CreateDefaultStyleStyleChildContext(
-    sal_uInt16 nFamily,
+    XmlStyleFamily nFamily,
     sal_uInt16 nPrefix,
     const OUString& rLocalName,
     const Reference< XAttributeList > & xAttrList )
@@ -996,9 +997,10 @@ SvXMLStyleContext* SdXMLStylesContext::CreateDefaultStyleStyleChildContext(
 
     switch( nFamily )
     {
-    case XML_STYLE_FAMILY_SD_GRAPHICS_ID:
+    case XmlStyleFamily::SD_GRAPHICS_ID:
         pContext = new XMLGraphicsDefaultStyle(GetSdImport(), nPrefix, rLocalName, xAttrList, *this );
         break;
+    default: break;
     }
 
     // call base class
@@ -1009,13 +1011,13 @@ SvXMLStyleContext* SdXMLStylesContext::CreateDefaultStyleStyleChildContext(
 }
 
 rtl::Reference< SvXMLImportPropertyMapper > SdXMLStylesContext::GetImportPropertyMapper(
-    sal_uInt16 nFamily) const
+    XmlStyleFamily nFamily) const
 {
     rtl::Reference < SvXMLImportPropertyMapper > xMapper;
 
     switch( nFamily )
     {
-    case XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID:
+    case XmlStyleFamily::SD_DRAWINGPAGE_ID:
     {
         if(!xPresImpPropMapper.is())
         {
@@ -1027,20 +1029,22 @@ rtl::Reference< SvXMLImportPropertyMapper > SdXMLStylesContext::GetImportPropert
         break;
     }
 
-    case XML_STYLE_FAMILY_TABLE_COLUMN:
-    case XML_STYLE_FAMILY_TABLE_ROW:
-    case XML_STYLE_FAMILY_TABLE_CELL:
+    case XmlStyleFamily::TABLE_COLUMN:
+    case XmlStyleFamily::TABLE_ROW:
+    case XmlStyleFamily::TABLE_CELL:
     {
         const rtl::Reference< XMLTableImport >& xTableImport( const_cast< SvXMLImport& >( GetImport() ).GetShapeImport()->GetShapeTableImport() );
 
         switch( nFamily )
         {
-        case XML_STYLE_FAMILY_TABLE_COLUMN: xMapper = xTableImport->GetColumnImportPropertySetMapper().get(); break;
-        case XML_STYLE_FAMILY_TABLE_ROW: xMapper = xTableImport->GetRowImportPropertySetMapper().get(); break;
-        case XML_STYLE_FAMILY_TABLE_CELL: xMapper = xTableImport->GetCellImportPropertySetMapper().get(); break;
+        case XmlStyleFamily::TABLE_COLUMN: xMapper = xTableImport->GetColumnImportPropertySetMapper().get(); break;
+        case XmlStyleFamily::TABLE_ROW: xMapper = xTableImport->GetRowImportPropertySetMapper().get(); break;
+        case XmlStyleFamily::TABLE_CELL: xMapper = xTableImport->GetCellImportPropertySetMapper().get(); break;
+        default: break;
         }
         break;
     }
+    default: break;
     }
 
     // call base class
@@ -1126,7 +1130,7 @@ void SdXMLStylesContext::SetMasterPageStyles(SdXMLMasterPageContext const & rMas
     {
         uno::Reference< container::XNameAccess > xMasterPageStyles( rStyleFamilies->getByName(rMaster.GetDisplayName()), UNO_QUERY_THROW );
         OUString sPrefix(rMaster.GetDisplayName() + "-");
-        ImpSetGraphicStyles(xMasterPageStyles, XML_STYLE_FAMILY_SD_PRESENTATION_ID, sPrefix);
+        ImpSetGraphicStyles(xMasterPageStyles, XmlStyleFamily::SD_PRESENTATION_ID, sPrefix);
     }
     catch (const uno::Exception&)
     {
@@ -1144,7 +1148,7 @@ void SdXMLStylesContext::ImpSetGraphicStyles() const
         const OUString sGraphicStyleName("graphics");
         uno::Reference< container::XNameAccess > xGraphicPageStyles( GetSdImport().GetLocalDocStyleFamilies()->getByName(sGraphicStyleName), uno::UNO_QUERY_THROW );
 
-        ImpSetGraphicStyles(xGraphicPageStyles, XML_STYLE_FAMILY_SD_GRAPHICS_ID, OUString());
+        ImpSetGraphicStyles(xGraphicPageStyles, XmlStyleFamily::SD_GRAPHICS_ID, OUString());
     }
     catch( uno::Exception& )
     {
@@ -1159,7 +1163,7 @@ void SdXMLStylesContext::ImpSetCellStyles() const
         const OUString sCellStyleName("cell");
         uno::Reference< container::XNameAccess > xGraphicPageStyles( GetSdImport().GetLocalDocStyleFamilies()->getByName(sCellStyleName), uno::UNO_QUERY_THROW );
 
-        ImpSetGraphicStyles(xGraphicPageStyles, XML_STYLE_FAMILY_TABLE_CELL, OUString());
+        ImpSetGraphicStyles(xGraphicPageStyles, XmlStyleFamily::TABLE_CELL, OUString());
     }
     catch( uno::Exception& )
     {
@@ -1201,7 +1205,7 @@ static bool canSkipReset(const OUString &rName, const XMLPropStyleContext* pProp
 
 // help function used by ImpSetGraphicStyles() and ImpSetMasterPageStyles()
 
-void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAccess > const & xPageStyles,  sal_uInt16 nFamily,  const OUString& rPrefix) const
+void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAccess > const & xPageStyles,  XmlStyleFamily nFamily,  const OUString& rPrefix) const
 {
     sal_Int32 nPrefLen(rPrefix.getLength());
 
diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx
index 6ca56fd7d3fc..c49be6294dc5 100644
--- a/xmloff/source/draw/ximpstyl.hxx
+++ b/xmloff/source/draw/ximpstyl.hxx
@@ -182,7 +182,7 @@ class SdXMLStylesContext : public SvXMLStylesContext
     void ImpSetGraphicStyles() const;
     void ImpSetCellStyles() const;
     void ImpSetGraphicStyles( css::uno::Reference< css::container::XNameAccess > const & xPageStyles,
-        sal_uInt16 nFamily, const OUString& rPrefix) const;
+        XmlStyleFamily nFamily, const OUString& rPrefix) const;
 
 protected:
     virtual SvXMLStyleContext* CreateStyleChildContext(
@@ -191,13 +191,13 @@ protected:
         const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList) override;
 
     virtual SvXMLStyleContext *CreateStyleStyleChildContext(
-        sal_uInt16 nFamily,
+        XmlStyleFamily nFamily,
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
         const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList) override;
 
     virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext(
-        sal_uInt16 nFamily, sal_uInt16 nPrefix,
+        XmlStyleFamily nFamily, sal_uInt16 nPrefix,
         const OUString& rLocalName,
         const css::uno::Reference<
             css::xml::sax::XAttributeList > & xAttrList ) override;
@@ -208,7 +208,7 @@ public:
         bool bIsAutoStyle);
 
     virtual void EndElement() override;
-    virtual rtl::Reference< SvXMLImportPropertyMapper > GetImportPropertyMapper(sal_uInt16 nFamily) const override;
+    virtual rtl::Reference< SvXMLImportPropertyMapper > GetImportPropertyMapper(XmlStyleFamily nFamily) const override;
 
     void SetMasterPageStyles(SdXMLMasterPageContext const & rMaster) const;