fdo#84938: convert EXPORT_ #defines to 'enum class'

Change-Id: I2ed239fa073b5fa8fb56c1af9d4b0bac89acfacf

20 files changed, 133 insertions, 133 deletions

diff --git a/xmloff/inc/MetaExportComponent.hxx b/xmloff/inc/MetaExportComponent.hxx
index 749d414d17ef..95bcf8a1ae7e 100644
--- a/xmloff/inc/MetaExportComponent.hxx
+++ b/xmloff/inc/MetaExportComponent.hxx
@@ -32,7 +32,7 @@ class XMLMetaExportComponent : public SvXMLExport
 public:
     XMLMetaExportComponent(
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
-        OUString const & implementationName, sal_uInt16 nFlags
+        OUString const & implementationName, SvXMLExportFlags nFlags
         );
 
     virtual ~XMLMetaExportComponent();
diff --git a/xmloff/inc/SchXMLExport.hxx b/xmloff/inc/SchXMLExport.hxx
index 5ef7645da79e..e9e215912c45 100644
--- a/xmloff/inc/SchXMLExport.hxx
+++ b/xmloff/inc/SchXMLExport.hxx
@@ -54,7 +54,7 @@ public:
     SchXMLExport(
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
         OUString const & implementationName,
-        sal_uInt16 nExportFlags = EXPORT_ALL );
+        SvXMLExportFlags nExportFlags = SvXMLExportFlags::ALL );
     virtual ~SchXMLExport();
 
     rtl::Reference< XMLPropertySetMapper > GetPropertySetMapper() const;
diff --git a/xmloff/qa/unit/uxmloff.cxx b/xmloff/qa/unit/uxmloff.cxx
index 9ca27fdce217..8b3cb66a010c 100644
--- a/xmloff/qa/unit/uxmloff.cxx
+++ b/xmloff/qa/unit/uxmloff.cxx
@@ -49,7 +49,7 @@ void Test::setUp()
 
     pExport = new SchXMLExport(
         comphelper::getProcessComponentContext(), "SchXMLExport.Compact",
-        EXPORT_ALL);
+        SvXMLExportFlags::ALL);
 }
 
 void Test::tearDown()
diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx
index 6784a4cf68bb..2abcc132a11c 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -262,7 +262,7 @@ void XMLChartExportPropertyMapper::ContextFilter(
                 // but also for the OOo XML Flat format (used by binfilter),
                 // because there, the transformation to OOo is done after the
                 // complete export of the chart in OASIS format.
-                if( mrExport.getExportFlags() & EXPORT_OASIS )
+                if( mrExport.getExportFlags() & SvXMLExportFlags::OASIS )
                     property->mnIndex = -1;
                 break;
         }
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 74ea3ba16914..5ab0b165f873 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -3557,7 +3557,7 @@ void SchXMLExportHelper_Impl::exportText( const OUString& rText, bool bConvertTa
 
 SchXMLExport::SchXMLExport(
     const Reference< uno::XComponentContext >& xContext,
-    OUString const & implementationName, sal_uInt16 nExportFlags )
+    OUString const & implementationName, SvXMLExportFlags nExportFlags )
 :   SvXMLExport( util::MeasureUnit::CM, xContext, implementationName,
         ::xmloff::token::XML_CHART, nExportFlags ),
     maAutoStylePool( *this ),
@@ -3601,7 +3601,7 @@ void SchXMLExport::_ExportMasterStyles()
 void SchXMLExport::_ExportAutoStyles()
 {
     // there are no styles that require their own autostyles
-    if( getExportFlags() & EXPORT_CONTENT )
+    if( getExportFlags() & SvXMLExportFlags::CONTENT )
     {
         Reference< chart::XChartDocument > xChartDoc( GetModel(), uno::UNO_QUERY );
         if( xChartDoc.is())
@@ -3759,7 +3759,7 @@ Reference< uno::XInterface > SAL_CALL SchXMLExport_createInstance(const Referenc
 {
     // #110680#
     // #103997# removed some flags from EXPORT_ALL
-    return (cppu::OWeakObject*)new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_getImplementationName(), EXPORT_ALL ^ ( EXPORT_SETTINGS | EXPORT_MASTERSTYLES | EXPORT_SCRIPTS ));
+    return (cppu::OWeakObject*)new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_getImplementationName(), SvXMLExportFlags::ALL ^ ( SvXMLExportFlags::SETTINGS | SvXMLExportFlags::MASTERSTYLES | SvXMLExportFlags::SCRIPTS ));
 }
 
 // Oasis format
@@ -3780,7 +3780,7 @@ Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_createInstance(const Re
     // #103997# removed some flags from EXPORT_ALL
     return (cppu::OWeakObject*)new SchXMLExport( comphelper::getComponentContext(rSMgr),
         SchXMLExport_Oasis_getImplementationName(),
-        (EXPORT_ALL ^ ( EXPORT_SETTINGS | EXPORT_MASTERSTYLES | EXPORT_SCRIPTS )) | EXPORT_OASIS );
+        (SvXMLExportFlags::ALL ^ ( SvXMLExportFlags::SETTINGS | SvXMLExportFlags::MASTERSTYLES | SvXMLExportFlags::SCRIPTS )) | SvXMLExportFlags::OASIS );
 }
 
 // multiple storage version: one for content / styles / meta
@@ -3800,7 +3800,7 @@ OUString SAL_CALL SchXMLExport_Styles_getImplementationName() throw()
 Reference< uno::XInterface > SAL_CALL SchXMLExport_Styles_createInstance(const Reference< lang::XMultiServiceFactory >& rSMgr) throw( uno::Exception )
 {
     // #110680#
-    return (cppu::OWeakObject*)new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Styles_getImplementationName(), EXPORT_STYLES );
+    return (cppu::OWeakObject*)new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Styles_getImplementationName(), SvXMLExportFlags::STYLES );
 }
 
 // Oasis format
@@ -3818,7 +3818,7 @@ OUString SAL_CALL SchXMLExport_Oasis_Styles_getImplementationName() throw()
 
 Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Styles_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
 {
-    return (cppu::OWeakObject*)new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Oasis_Styles_getImplementationName(), EXPORT_STYLES | EXPORT_OASIS );
+    return (cppu::OWeakObject*)new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Oasis_Styles_getImplementationName(), SvXMLExportFlags::STYLES | SvXMLExportFlags::OASIS );
 }
 
 Sequence< OUString > SAL_CALL SchXMLExport_Content_getSupportedServiceNames() throw()
@@ -3836,7 +3836,7 @@ OUString SAL_CALL SchXMLExport_Content_getImplementationName() throw()
 Reference< uno::XInterface > SAL_CALL SchXMLExport_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
 {
     // #110680#
-    return (cppu::OWeakObject*)new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Content_getImplementationName(), EXPORT_AUTOSTYLES | EXPORT_CONTENT | EXPORT_FONTDECLS );
+    return (cppu::OWeakObject*)new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Content_getImplementationName(), SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::CONTENT | SvXMLExportFlags::FONTDECLS );
 }
 
 // Oasis format
@@ -3854,7 +3854,7 @@ OUString SAL_CALL SchXMLExport_Oasis_Content_getImplementationName() throw()
 
 Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
 {
-    return (cppu::OWeakObject*)new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Oasis_Content_getImplementationName(), EXPORT_AUTOSTYLES | EXPORT_CONTENT | EXPORT_FONTDECLS | EXPORT_OASIS );
+    return (cppu::OWeakObject*)new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Oasis_Content_getImplementationName(), SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::CONTENT | SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::OASIS );
 }
 
 // Oasis format
@@ -3872,7 +3872,7 @@ OUString SAL_CALL SchXMLExport_Oasis_Meta_getImplementationName() throw()
 
 Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Meta_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
 {
-    return (cppu::OWeakObject*)new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Oasis_Meta_getImplementationName(), EXPORT_META | EXPORT_OASIS  );
+    return (cppu::OWeakObject*)new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Oasis_Meta_getImplementationName(), SvXMLExportFlags::META | SvXMLExportFlags::OASIS  );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 3de55bf763e7..b37878466a88 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -308,36 +308,36 @@ void SvXMLExport::SetDocHandler( const uno::Reference< xml::sax::XDocumentHandle
 void SvXMLExport::_InitCtor()
 {
     // note: it is not necessary to add XML_NP_XML (it is declared implicitly)
-    if( (getExportFlags() & ~EXPORT_OASIS) != 0 )
+    if( getExportFlags() & ~SvXMLExportFlags::OASIS )
     {
         mpNamespaceMap->Add( GetXMLToken(XML_NP_OFFICE), GetXMLToken(XML_N_OFFICE), XML_NAMESPACE_OFFICE );
         mpNamespaceMap->Add( GetXMLToken(XML_NP_OOO), GetXMLToken(XML_N_OOO), XML_NAMESPACE_OOO );
     }
-    if( (getExportFlags() & (EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS) ) != 0 )
+    if( getExportFlags() & (SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::FONTDECLS) )
     {
         mpNamespaceMap->Add( GetXMLToken(XML_NP_FO), GetXMLToken(XML_N_FO_COMPAT), XML_NAMESPACE_FO );
     }
-    if( (getExportFlags() & (EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS) ) != 0 )
+    if( getExportFlags() & (SvXMLExportFlags::META|SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::SETTINGS) )
     {
         mpNamespaceMap->Add( GetXMLToken(XML_NP_XLINK), GetXMLToken(XML_N_XLINK), XML_NAMESPACE_XLINK );
     }
-    if( (getExportFlags() & EXPORT_SETTINGS) != 0 )
+    if( getExportFlags() & SvXMLExportFlags::SETTINGS )
     {
         mpNamespaceMap->Add( GetXMLToken(XML_NP_CONFIG), GetXMLToken(XML_N_CONFIG), XML_NAMESPACE_CONFIG );
     }
 
-    if( (getExportFlags() & (EXPORT_META|EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 )
+    if( getExportFlags() & (SvXMLExportFlags::META|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT) )
     {
         mpNamespaceMap->Add( GetXMLToken(XML_NP_DC), GetXMLToken(XML_N_DC), XML_NAMESPACE_DC );
         mpNamespaceMap->Add( GetXMLToken(XML_NP_META), GetXMLToken(XML_N_META), XML_NAMESPACE_META );
     }
-    if( (getExportFlags() & (EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_FONTDECLS) ) != 0 )
+    if( getExportFlags() & (SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::FONTDECLS) )
     {
         mpNamespaceMap->Add( GetXMLToken(XML_NP_STYLE), GetXMLToken(XML_N_STYLE), XML_NAMESPACE_STYLE );
     }
 
     // namespaces for documents
-    if( (getExportFlags() & (EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 )
+    if( getExportFlags() & (SvXMLExportFlags::STYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT) )
     {
         mpNamespaceMap->Add( GetXMLToken(XML_NP_DC),    GetXMLToken(XML_N_DC),      XML_NAMESPACE_DC );
         mpNamespaceMap->Add( GetXMLToken(XML_NP_TEXT),  GetXMLToken(XML_N_TEXT),    XML_NAMESPACE_TEXT );
@@ -365,17 +365,17 @@ void SvXMLExport::_InitCtor()
                 XML_NAMESPACE_LO_EXT);
         }
     }
-    if( (getExportFlags() & (EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 )
+    if( getExportFlags() & (SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT) )
     {
         mpNamespaceMap->Add( GetXMLToken(XML_NP_MATH), GetXMLToken(XML_N_MATH), XML_NAMESPACE_MATH );
         mpNamespaceMap->Add( GetXMLToken(XML_NP_FORM), GetXMLToken(XML_N_FORM), XML_NAMESPACE_FORM );
     }
-    if( (getExportFlags() & (EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_MASTERSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS) ) != 0 )
+    if( getExportFlags() & (SvXMLExportFlags::STYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS) )
     {
         mpNamespaceMap->Add( GetXMLToken(XML_NP_SCRIPT), GetXMLToken(XML_N_SCRIPT), XML_NAMESPACE_SCRIPT );
         mpNamespaceMap->Add( GetXMLToken(XML_NP_DOM), GetXMLToken(XML_N_DOM), XML_NAMESPACE_DOM );
     }
-    if( (getExportFlags() & EXPORT_CONTENT ) != 0 )
+    if( getExportFlags() & SvXMLExportFlags::CONTENT )
     {
         mpNamespaceMap->Add( GetXMLToken(XML_NP_XFORMS_1_0), GetXMLToken(XML_N_XFORMS_1_0), XML_NAMESPACE_XFORMS );
         mpNamespaceMap->Add( GetXMLToken(XML_NP_XSD), GetXMLToken(XML_N_XSD), XML_NAMESPACE_XSD );
@@ -384,19 +384,19 @@ void SvXMLExport::_InitCtor()
         mpNamespaceMap->Add( GetXMLToken(XML_NP_FORMX), GetXMLToken(XML_N_FORMX), XML_NAMESPACE_FORMX );
     }
     // RDFa: needed for content and header/footer styles
-    if( (getExportFlags() & (EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 )
+    if( getExportFlags() & (SvXMLExportFlags::STYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT) )
     {
         mpNamespaceMap->Add( GetXMLToken(XML_NP_XHTML),
             GetXMLToken(XML_N_XHTML), XML_NAMESPACE_XHTML );
     }
     // GRDDL: to convert RDFa and meta.xml to RDF
-    if( (getExportFlags() & (EXPORT_META|EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 )
+    if( getExportFlags() & (SvXMLExportFlags::META|SvXMLExportFlags::STYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT) )
     {
         mpNamespaceMap->Add( GetXMLToken(XML_NP_GRDDL),
             GetXMLToken(XML_N_GRDDL), XML_NAMESPACE_GRDDL );
     }
     // CSS Text Level 3 for distributed text justification.
-    if ( (getExportFlags() & (EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_MASTERSTYLES)) != 0 )
+    if ( getExportFlags() & (SvXMLExportFlags::STYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::MASTERSTYLES) )
     {
         mpNamespaceMap->Add(
             GetXMLToken(XML_NP_CSS3TEXT), GetXMLToken(XML_N_CSS3TEXT), XML_NAMESPACE_CSS3TEXT );
@@ -417,7 +417,7 @@ void SvXMLExport::_InitCtor()
     _DetermineModelType();
 
     // cl: but only if we do export to current oasis format, old openoffice format *must* always be compatible
-    if( (getExportFlags() & EXPORT_OASIS) != 0 )
+    if( getExportFlags() & SvXMLExportFlags::OASIS )
     {
         mpImpl->mbSaveBackwardCompatibleODF =
             officecfg::Office::Common::Save::Document::
@@ -440,7 +440,7 @@ SvXMLExport::SvXMLExport(
     sal_Int16 const eDefaultMeasureUnit /*css::util::MeasureUnit*/,
     const uno::Reference< uno::XComponentContext >& xContext,
     OUString const & implementationName,
-    const enum XMLTokenEnum eClass, sal_uInt16 nExportFlags )
+    const enum XMLTokenEnum eClass, SvXMLExportFlags nExportFlags )
 :   mpImpl( new SvXMLExport_Impl ),
     m_xContext(xContext), m_implementationName(implementationName),
     mpAttrList( new SvXMLAttributeList ),
@@ -485,7 +485,7 @@ SvXMLExport::SvXMLExport(
     mpXMLErrors( NULL ),
     mbExtended( false ),
     meClass( XML_TOKEN_INVALID ),
-    mnExportFlags( 0 ),
+    mnExportFlags( SvXMLExportFlags::NONE ),
     mnErrorFlags( ERROR_NO ),
     msWS( GetXMLToken(XML_WS) ),
     mbSaveLinkedSections(true)
@@ -524,7 +524,7 @@ SvXMLExport::SvXMLExport(
     mpXMLErrors( NULL ),
     mbExtended( false ),
     meClass( XML_TOKEN_INVALID ),
-    mnExportFlags( 0 ),
+    mnExportFlags( SvXMLExportFlags::NONE ),
     mnErrorFlags( ERROR_NO ),
     msWS( GetXMLToken(XML_WS) ),
     mbSaveLinkedSections(true)
@@ -570,7 +570,7 @@ SvXMLExport::~SvXMLExport()
                     if (xPropertySetInfo->hasPropertyByName(sRepeat))
                         mxExportInfo->setPropertyValue(sRepeat, css::uno::makeAny(mpProgressBarHelper->GetRepeat()));
                 }
-                if (mpNumExport && (mnExportFlags & (EXPORT_AUTOSTYLES | EXPORT_STYLES)))
+                if (mpNumExport && (mnExportFlags & (SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::STYLES)))
                 {
                     OUString sWrittenNumberFormats(XML_WRITTENNUMBERSTYLES);
                     if (xPropertySetInfo->hasPropertyByName(sWrittenNumberFormats))
@@ -623,12 +623,12 @@ void SAL_CALL SvXMLExport::setSourceDocument( const uno::Reference< lang::XCompo
             {
                 uno::Any aAny = mxExportInfo->getPropertyValue(sUsePrettyPrinting);
                 if (::cppu::any2bool(aAny))
-                    mnExportFlags |= EXPORT_PRETTY;
+                    mnExportFlags |= SvXMLExportFlags::PRETTY;
                 else
-                    mnExportFlags &= ~EXPORT_PRETTY;
+                    mnExportFlags &= ~SvXMLExportFlags::PRETTY;
             }
 
-            if (mpNumExport && (mnExportFlags & (EXPORT_AUTOSTYLES | EXPORT_STYLES)))
+            if (mpNumExport && (mnExportFlags & (SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::STYLES)))
             {
                 OUString sWrittenNumberFormats(XML_WRITTENNUMBERSTYLES);
                 if (xPropertySetInfo->hasPropertyByName(sWrittenNumberFormats))
@@ -643,9 +643,9 @@ void SAL_CALL SvXMLExport::setSourceDocument( const uno::Reference< lang::XCompo
     }
 
     if ( mpImpl->mbSaveBackwardCompatibleODF )
-        mnExportFlags |= EXPORT_SAVEBACKWARDCOMPATIBLE;
+        mnExportFlags |= SvXMLExportFlags::SAVEBACKWARDCOMPATIBLE;
     else
-        mnExportFlags &= ~EXPORT_SAVEBACKWARDCOMPATIBLE;
+        mnExportFlags &= ~SvXMLExportFlags::SAVEBACKWARDCOMPATIBLE;
 
     // namespaces for user defined attributes
     Reference< XMultiServiceFactory > xFactory( mxModel,    UNO_QUERY );
@@ -806,8 +806,8 @@ sal_Bool SAL_CALL SvXMLExport::filter( const uno::Sequence< beans::PropertyValue
     {
         const sal_Int32 nPropCount = aDescriptor.getLength();
 
-        const sal_uInt32 nTest =
-            EXPORT_META|EXPORT_STYLES|EXPORT_CONTENT|EXPORT_SETTINGS;
+        const SvXMLExportFlags nTest =
+            SvXMLExportFlags::META|SvXMLExportFlags::STYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SETTINGS;
         if( (mnExportFlags & nTest) == nTest && msOrigFileName.isEmpty() )
         {
             // evaluate descriptor only for flat files and if a base URI
@@ -1202,7 +1202,7 @@ void SvXMLExport::ImplExportStyles( bool )
     }
 
     // transfer style names (+ families) TO other components (if appropriate)
-    if( ( ( mnExportFlags & EXPORT_CONTENT ) == 0 ) && mxExportInfo.is() )
+    if( ( !( mnExportFlags & SvXMLExportFlags::CONTENT ) ) && mxExportInfo.is() )
     {
         static OUString sStyleNames( "StyleNames" );
         static OUString sStyleFamilies( "StyleFamilies" );
@@ -1224,7 +1224,7 @@ void SvXMLExport::ImplExportAutoStyles( bool )
     // transfer style names (+ families) FROM other components (if appropriate)
     OUString sStyleNames( "StyleNames" );
     OUString sStyleFamilies( "StyleFamilies" );
-    if( ( ( mnExportFlags & EXPORT_STYLES ) == 0 )
+    if( ( !( mnExportFlags & SvXMLExportFlags::STYLES ) )
         && mxExportInfo.is()
         && mxExportInfo->getPropertySetInfo()->hasPropertyByName( sStyleNames )
         && mxExportInfo->getPropertySetInfo()->hasPropertyByName( sStyleFamilies ) )
@@ -1292,7 +1292,7 @@ void SvXMLExport::SetBodyAttributes()
 }
 
 static void
-lcl_AddGrddl(SvXMLExport & rExport, const sal_Int32 /*nExportMode*/)
+lcl_AddGrddl(SvXMLExport & rExport, const SvXMLExportFlags /*nExportMode*/)
 {
     // check version >= 1.2
     switch (rExport.getDefaultVersion()) {
@@ -1303,7 +1303,7 @@ lcl_AddGrddl(SvXMLExport & rExport, const sal_Int32 /*nExportMode*/)
 
     // #i115030#: disabled, the XSLT is not finished, and not available via HTTP
 #if 0
-    if (EXPORT_SETTINGS != nExportMode) // meta, content, styles
+    if (SvXMLExportFlags::SETTINGS != nExportMode) // meta, content, styles
     {
         rExport.AddAttribute( XML_NAMESPACE_GRDDL, XML_TRANSFORMATION,
             OUString("http://FIXME") );
@@ -1354,7 +1354,7 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass )
             }
         }
     }
-    if( (getExportFlags() & EXPORT_OASIS) == 0 )
+    if( (getExportFlags() & SvXMLExportFlags::OASIS) == SvXMLExportFlags::NONE )
     {
         try
         {
@@ -1443,26 +1443,26 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass )
 
     {
         enum XMLTokenEnum eRootService = XML_TOKEN_INVALID;
-        const sal_Int32 nExportMode = mnExportFlags & (EXPORT_META|EXPORT_STYLES|EXPORT_CONTENT|EXPORT_SETTINGS);
+        const SvXMLExportFlags nExportMode = mnExportFlags & (SvXMLExportFlags::META|SvXMLExportFlags::STYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SETTINGS);
 
         lcl_AddGrddl(*this, nExportMode);
 
-        if( EXPORT_META == nExportMode )
+        if( SvXMLExportFlags::META == nExportMode )
         {
             // export only meta
             eRootService = XML_DOCUMENT_META;
         }
-        else if ( EXPORT_SETTINGS == nExportMode )
+        else if ( SvXMLExportFlags::SETTINGS == nExportMode )
         {
             // export only settings
             eRootService = XML_DOCUMENT_SETTINGS;
         }
-        else if( EXPORT_STYLES == nExportMode )
+        else if( SvXMLExportFlags::STYLES == nExportMode )
         {
             // export only styles
             eRootService = XML_DOCUMENT_STYLES;
         }
-        else if( EXPORT_CONTENT == nExportMode )
+        else if( SvXMLExportFlags::CONTENT == nExportMode )
         {
             // export only content
             eRootService = XML_DOCUMENT_CONTENT;
@@ -1483,35 +1483,35 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass )
         SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, eRootService, true, true );
 
         // meta information
-        if( mnExportFlags & EXPORT_META )
+        if( mnExportFlags & SvXMLExportFlags::META )
             ImplExportMeta();
 
         // settings
-        if( mnExportFlags & EXPORT_SETTINGS )
+        if( mnExportFlags & SvXMLExportFlags::SETTINGS )
             ImplExportSettings();
 
         // scripts
-        if( mnExportFlags & EXPORT_SCRIPTS )
+        if( mnExportFlags & SvXMLExportFlags::SCRIPTS )
             _ExportScripts();
 
         // font declerations
-        if( mnExportFlags & EXPORT_FONTDECLS )
+        if( mnExportFlags & SvXMLExportFlags::FONTDECLS )
             _ExportFontDecls();
 
         // styles
-        if( mnExportFlags & EXPORT_STYLES )
+        if( mnExportFlags & SvXMLExportFlags::STYLES )
             ImplExportStyles( false );
 
         // autostyles
-        if( mnExportFlags & EXPORT_AUTOSTYLES )
+        if( mnExportFlags & SvXMLExportFlags::AUTOSTYLES )
             ImplExportAutoStyles( false );
 
         // masterstyles
-        if( mnExportFlags & EXPORT_MASTERSTYLES )
+        if( mnExportFlags & SvXMLExportFlags::MASTERSTYLES )
             ImplExportMasterStyles( false );
 
         // contnt
-        if( mnExportFlags & EXPORT_CONTENT )
+        if( mnExportFlags & SvXMLExportFlags::CONTENT )
             ImplExportContent();
     }
 
@@ -1580,7 +1580,7 @@ void SvXMLExport::_ExportScripts()
     SvXMLElementExport aElement( *this, XML_NAMESPACE_OFFICE, XML_SCRIPTS, true, true );
 
     // export Basic macros (only for FlatXML)
-    if ( mnExportFlags & EXPORT_EMBEDDED )
+    if ( mnExportFlags & SvXMLExportFlags::EMBEDDED )
     {
         OUString aValue( GetNamespaceMap().GetPrefixByKey( XML_NAMESPACE_OOO ) );
         aValue += ":Basic";
@@ -1955,7 +1955,7 @@ OUString SvXMLExport::AddEmbeddedGraphicObject( const OUString& rGraphicObjectUR
     if( rGraphicObjectURL.startsWith( msGraphicObjectProtocol ) &&
         mxGraphicResolver.is() )
     {
-        if( (getExportFlags() & EXPORT_EMBEDDED) == 0 )
+        if( !(getExportFlags() & SvXMLExportFlags::EMBEDDED) )
             sRet = mxGraphicResolver->resolveGraphicObjectURL( rGraphicObjectURL );
         else
             sRet.clear();
@@ -1970,7 +1970,7 @@ bool SvXMLExport::AddEmbeddedGraphicObjectAsBase64( const OUString& rGraphicObje
 {
     bool bRet = false;
 
-    if( (getExportFlags() & EXPORT_EMBEDDED) != 0 &&
+    if( (getExportFlags() & SvXMLExportFlags::EMBEDDED) &&
         rGraphicObjectURL.startsWith( msGraphicObjectProtocol ) &&
         mxGraphicResolver.is() )
     {
@@ -2252,7 +2252,7 @@ void SvXMLExport::StartElement(const OUString& rName,
     {
         try
         {
-            if( bIgnWSOutside && ((mnExportFlags & EXPORT_PRETTY) == EXPORT_PRETTY))
+            if( bIgnWSOutside && ((mnExportFlags & SvXMLExportFlags::PRETTY) == SvXMLExportFlags::PRETTY))
                 mxHandler->ignorableWhitespace( msWS );
             mxHandler->startElement( rName, GetXAttrList() );
         }
@@ -2325,7 +2325,7 @@ void SvXMLExport::EndElement(const OUString& rName,
     {
         try
         {
-            if( bIgnWSInside && ((mnExportFlags & EXPORT_PRETTY) == EXPORT_PRETTY))
+            if( bIgnWSInside && ((mnExportFlags & SvXMLExportFlags::PRETTY) == SvXMLExportFlags::PRETTY))
                 mxHandler->ignorableWhitespace( msWS );
             mxHandler->endElement( rName );
         }
@@ -2341,7 +2341,7 @@ void SvXMLExport::EndElement(const OUString& rName,
 
 void SvXMLExport::IgnorableWhitespace()
 {
-    if ((mnExportFlags & EXPORT_PRETTY) != EXPORT_PRETTY)
+    if ((mnExportFlags & SvXMLExportFlags::PRETTY) != SvXMLExportFlags::PRETTY)
         return;
 
     if ((mnErrorFlags & ERROR_DO_NOTHING) != ERROR_DO_NOTHING)
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index 11ed567aa65a..b1e3ae7573fc 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -1049,7 +1049,7 @@ void AnimationsExporterImpl::exportContainer( const Reference< XTimeContainer >&
             double fTemp = xIter->getIterateInterval();
             if( fTemp )
             {
-                if( 0 == ( mrExport.getExportFlags() & EXPORT_SAVEBACKWARDCOMPATIBLE ) )
+                if( !( mrExport.getExportFlags() & SvXMLExportFlags::SAVEBACKWARDCOMPATIBLE ) )
                 {
                     // issue 146582
                     OUStringBuffer buf;
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 04d579811750..009c2ec67c16 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -1605,12 +1605,12 @@ void XMLPageExportPropertyMapper::ContextFilter(
                 pTransType = property;
                 break;
             case CTF_PAGE_TRANS_STYLE:
-                if( mrExport.getExportFlags() & EXPORT_OASIS )
+                if( mrExport.getExportFlags() & SvXMLExportFlags::OASIS )
                     (*property).mnIndex = -1;
                 break;
             case CTF_PAGE_TRANSITION_TYPE:
                 {
-                    if( ((mrExport.getExportFlags() & EXPORT_OASIS) == 0) ||
+                    if( (!(mrExport.getExportFlags() & SvXMLExportFlags::OASIS)) ||
                         (((*property).maValue >>= nTransitionType) && (nTransitionType == 0)) )
                             (*property).mnIndex = -1;
                 }
@@ -1618,7 +1618,7 @@ void XMLPageExportPropertyMapper::ContextFilter(
             case CTF_PAGE_TRANSITION_SUBTYPE:
                 {
                     sal_Int16 nTransitionSubtype = sal_Int16();
-                    if( ((mrExport.getExportFlags() & EXPORT_OASIS) == 0) ||
+                    if( (!(mrExport.getExportFlags() & SvXMLExportFlags::OASIS)) ||
                         (((*property).maValue >>= nTransitionSubtype) && (nTransitionSubtype == 0)) )
                             (*property).mnIndex = -1;
 
@@ -1627,13 +1627,13 @@ void XMLPageExportPropertyMapper::ContextFilter(
             case CTF_PAGE_TRANSITION_DIRECTION:
                 {
                     bool bDirection;
-                    if( ((mrExport.getExportFlags() & EXPORT_OASIS) == 0) ||
+                    if( (!(mrExport.getExportFlags() & SvXMLExportFlags::OASIS)) ||
                         (((*property).maValue >>= bDirection) && bDirection) )
                             (*property).mnIndex = -1;
                 }
                 break;
             case CTF_PAGE_TRANSITION_FADECOLOR:
-                if( ((mrExport.getExportFlags() & EXPORT_OASIS) == 0) )
+                if( (!(mrExport.getExportFlags() & SvXMLExportFlags::OASIS)) )
                     (*property).mnIndex = -1;
                 else
                     pTransitionFadeColor = property;
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 142f1e68a845..723542bc48ec 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -393,7 +393,7 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI
 SdXMLExport::SdXMLExport(
     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
     OUString const & implementationName,
-    bool bIsDraw, sal_uInt16 nExportFlags )
+    bool bIsDraw, SvXMLExportFlags nExportFlags )
 :   SvXMLExport( util::MeasureUnit::CM, xContext, implementationName,
         (bIsDraw) ? XML_GRAPHICS : XML_PRESENTATION, nExportFlags ),
     mnDocMasterPageCount(0L),
@@ -1867,7 +1867,7 @@ void SdXMLExport::_ExportContent()
             // prepare animation export
             if(IsImpress())
             {
-                if( getExportFlags() & EXPORT_OASIS )
+                if( getExportFlags() & SvXMLExportFlags::OASIS )
                 {
                     // export new animations for oasis format
                     xAnimNodeSupplier.set( xDrawPage, UNO_QUERY );
@@ -2196,7 +2196,7 @@ void SdXMLExport::_ExportAutoStyles()
 
     GetPropertySetMapper()->SetAutoStyles( true );
 
-    if( getExportFlags() & EXPORT_STYLES )
+    if( getExportFlags() & SvXMLExportFlags::STYLES )
     {
         // #80012# PageMaster export moved from _ExportStyles
         // prepare page-master infos
@@ -2209,7 +2209,7 @@ void SdXMLExport::_ExportAutoStyles()
         ImpPrepMasterPageInfos();
     }
 
-    if( getExportFlags() & EXPORT_CONTENT )
+    if( getExportFlags() & SvXMLExportFlags::CONTENT )
     {
         // prepare draw:style-name for page export
         ImpPrepDrawPageInfos();
@@ -2223,7 +2223,7 @@ void SdXMLExport::_ExportAutoStyles()
         GetNamespaceMap()
         );
 
-    if( getExportFlags() & EXPORT_STYLES )
+    if( getExportFlags() & SvXMLExportFlags::STYLES )
     {
         // create auto style infos for shapes on master handout page
         if( IsImpress() )
@@ -2290,10 +2290,10 @@ void SdXMLExport::_ExportAutoStyles()
         }
     }
 
-    if( getExportFlags() & EXPORT_CONTENT )
+    if( getExportFlags() & SvXMLExportFlags::CONTENT )
     {
         // prepare animations exporter if impress
-        if(IsImpress() && ((getExportFlags() & EXPORT_OASIS) == 0) )
+        if(IsImpress() && (!(getExportFlags() & SvXMLExportFlags::OASIS)) )
         {
             rtl::Reference< XMLAnimationsExporter > xAnimExport = new XMLAnimationsExporter( GetShapeExport().get() );
             GetShapeExport()->setAnimationsExporter( xAnimExport );
@@ -2368,7 +2368,7 @@ void SdXMLExport::_ExportAutoStyles()
 
     GetShapeExport()->exportAutoStyles();
 
-    sal_uInt16 nContentAutostyles = EXPORT_CONTENT | EXPORT_AUTOSTYLES;
+    SvXMLExportFlags nContentAutostyles = SvXMLExportFlags::CONTENT | SvXMLExportFlags::AUTOSTYLES;
     if ( ( getExportFlags() & nContentAutostyles ) == nContentAutostyles )
         GetFormExport()->exportAutoStyles( );
 
@@ -2757,37 +2757,37 @@ uno::Reference< uno::XInterface > SAL_CALL classname##_createInstance(const uno:
     return (cppu::OWeakObject*)new SdXMLExport( comphelper::getComponentContext(rSMgr), implementationname, draw, flags ); \
 }
 
-SERVICE( XMLImpressExportOasis, "com.sun.star.comp.Impress.XMLOasisExporter", "XMLImpressExportOasis", false, EXPORT_OASIS|EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS|EXPORT_FONTDECLS|EXPORT_EMBEDDED );
-SERVICE( XMLImpressStylesExportOasis, "com.sun.star.comp.Impress.XMLOasisStylesExporter", "XMLImpressStylesExportOasis", false, EXPORT_OASIS|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS );
-SERVICE( XMLImpressContentExportOasis, "com.sun.star.comp.Impress.XMLOasisContentExporter", "XMLImpressContentExportOasis", false, EXPORT_OASIS|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_FONTDECLS );
-SERVICE( XMLImpressMetaExportOasis, "com.sun.star.comp.Impress.XMLOasisMetaExporter", "XMLImpressMetaExportOasis", false, EXPORT_OASIS|EXPORT_META );
-SERVICE( XMLImpressSettingsExportOasis, "com.sun.star.comp.Impress.XMLOasisSettingsExporter", "XMLImpressSettingsExportOasis", false, EXPORT_OASIS|EXPORT_SETTINGS );
-
-SERVICE( XMLImpressExportOOO, "com.sun.star.comp.Impress.XMLExporter", "XMLImpressExportOOO", false, EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS|EXPORT_FONTDECLS|EXPORT_EMBEDDED );
-SERVICE( XMLImpressStylesExportOOO, "com.sun.star.comp.Impress.XMLStylesExporter", "XMLImpressStylesExportOOO", false, EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS );
-SERVICE( XMLImpressContentExportOOO, "com.sun.star.comp.Impress.XMLContentExporter", "XMLImpressContentExportOOO", false, EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_FONTDECLS );
-SERVICE( XMLImpressMetaExportOOO, "com.sun.star.comp.Impress.XMLMetaExporter", "XMLImpressMetaExportOOO", false, EXPORT_META );
-SERVICE( XMLImpressSettingsExportOOO, "com.sun.star.comp.Impress.XMLSettingsExporter", "XMLImpressSettingsExportOOO", false, EXPORT_SETTINGS );
-
-SERVICE( XMLDrawExportOasis, "com.sun.star.comp.Draw.XMLOasisExporter", "XMLDrawExportOasis", true, EXPORT_OASIS|EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS|EXPORT_FONTDECLS|EXPORT_EMBEDDED );
-SERVICE( XMLDrawStylesExportOasis, "com.sun.star.comp.Draw.XMLOasisStylesExporter", "XMLDrawStylesExportOasis", true, EXPORT_OASIS|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS );
-SERVICE( XMLDrawContentExportOasis, "com.sun.star.comp.Draw.XMLOasisContentExporter", "XMLDrawContentExportOasis", true, EXPORT_OASIS|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_FONTDECLS );
-SERVICE( XMLDrawMetaExportOasis, "com.sun.star.comp.Draw.XMLOasisMetaExporter", "XMLDrawMetaExportOasis", true, EXPORT_OASIS|EXPORT_META );
-SERVICE( XMLDrawSettingsExportOasis, "com.sun.star.comp.Draw.XMLOasisSettingsExporter", "XMLDrawSettingsExportOasis", true, EXPORT_OASIS|EXPORT_SETTINGS );
-
-SERVICE( XMLDrawExportOOO, "com.sun.star.comp.Draw.XMLExporter", "XMLDrawExportOOO", true, EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS|EXPORT_FONTDECLS|EXPORT_EMBEDDED );
-SERVICE( XMLDrawStylesExportOOO, "com.sun.star.comp.Draw.XMLStylesExporter", "XMLDrawStylesExportOOO", true, EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS );
-SERVICE( XMLDrawContentExportOOO, "com.sun.star.comp.Draw.XMLContentExporter", "XMLDrawContentExportOOO", true, EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_FONTDECLS );
-SERVICE( XMLDrawMetaExportOOO, "com.sun.star.comp.Draw.XMLMetaExporter", "XMLDrawMetaExportOOO", true, EXPORT_META );
-SERVICE( XMLDrawSettingsExportOOO, "com.sun.star.comp.Draw.XMLSettingsExporter", "XMLDrawSettingsExportOOO", true, EXPORT_SETTINGS );
-
-SERVICE( XMLDrawingLayerExport, "com.sun.star.comp.DrawingLayer.XMLExporter", "XMLDrawingLayerExport", true, EXPORT_OASIS|EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_FONTDECLS|EXPORT_EMBEDDED );
-SERVICE( XMLImpressClipboardExport, "com.sun.star.comp.Impress.XMLClipboardExporter", "XMLImpressClipboardExport", false, EXPORT_OASIS|EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_FONTDECLS|EXPORT_EMBEDDED );
+SERVICE( XMLImpressExportOasis, "com.sun.star.comp.Impress.XMLOasisExporter", "XMLImpressExportOasis", false, SvXMLExportFlags::OASIS|SvXMLExportFlags::META|SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::SETTINGS|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::EMBEDDED );
+SERVICE( XMLImpressStylesExportOasis, "com.sun.star.comp.Impress.XMLOasisStylesExporter", "XMLImpressStylesExportOasis", false, SvXMLExportFlags::OASIS|SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::FONTDECLS );
+SERVICE( XMLImpressContentExportOasis, "com.sun.star.comp.Impress.XMLOasisContentExporter", "XMLImpressContentExportOasis", false, SvXMLExportFlags::OASIS|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::FONTDECLS );
+SERVICE( XMLImpressMetaExportOasis, "com.sun.star.comp.Impress.XMLOasisMetaExporter", "XMLImpressMetaExportOasis", false, SvXMLExportFlags::OASIS|SvXMLExportFlags::META );
+SERVICE( XMLImpressSettingsExportOasis, "com.sun.star.comp.Impress.XMLOasisSettingsExporter", "XMLImpressSettingsExportOasis", false, SvXMLExportFlags::OASIS|SvXMLExportFlags::SETTINGS );
+
+SERVICE( XMLImpressExportOOO, "com.sun.star.comp.Impress.XMLExporter", "XMLImpressExportOOO", false, SvXMLExportFlags::META|SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::SETTINGS|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::EMBEDDED );
+SERVICE( XMLImpressStylesExportOOO, "com.sun.star.comp.Impress.XMLStylesExporter", "XMLImpressStylesExportOOO", false, SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::FONTDECLS );
+SERVICE( XMLImpressContentExportOOO, "com.sun.star.comp.Impress.XMLContentExporter", "XMLImpressContentExportOOO", false, SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::FONTDECLS );
+SERVICE( XMLImpressMetaExportOOO, "com.sun.star.comp.Impress.XMLMetaExporter", "XMLImpressMetaExportOOO", false, SvXMLExportFlags::META );
+SERVICE( XMLImpressSettingsExportOOO, "com.sun.star.comp.Impress.XMLSettingsExporter", "XMLImpressSettingsExportOOO", false, SvXMLExportFlags::SETTINGS );
+
+SERVICE( XMLDrawExportOasis, "com.sun.star.comp.Draw.XMLOasisExporter", "XMLDrawExportOasis", true, SvXMLExportFlags::OASIS|SvXMLExportFlags::META|SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::SETTINGS|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::EMBEDDED );
+SERVICE( XMLDrawStylesExportOasis, "com.sun.star.comp.Draw.XMLOasisStylesExporter", "XMLDrawStylesExportOasis", true, SvXMLExportFlags::OASIS|SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::FONTDECLS );
+SERVICE( XMLDrawContentExportOasis, "com.sun.star.comp.Draw.XMLOasisContentExporter", "XMLDrawContentExportOasis", true, SvXMLExportFlags::OASIS|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::FONTDECLS );
+SERVICE( XMLDrawMetaExportOasis, "com.sun.star.comp.Draw.XMLOasisMetaExporter", "XMLDrawMetaExportOasis", true, SvXMLExportFlags::OASIS|SvXMLExportFlags::META );
+SERVICE( XMLDrawSettingsExportOasis, "com.sun.star.comp.Draw.XMLOasisSettingsExporter", "XMLDrawSettingsExportOasis", true, SvXMLExportFlags::OASIS|SvXMLExportFlags::SETTINGS );
+
+SERVICE( XMLDrawExportOOO, "com.sun.star.comp.Draw.XMLExporter", "XMLDrawExportOOO", true, SvXMLExportFlags::META|SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::SETTINGS|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::EMBEDDED );
+SERVICE( XMLDrawStylesExportOOO, "com.sun.star.comp.Draw.XMLStylesExporter", "XMLDrawStylesExportOOO", true, SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::FONTDECLS );
+SERVICE( XMLDrawContentExportOOO, "com.sun.star.comp.Draw.XMLContentExporter", "XMLDrawContentExportOOO", true, SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::FONTDECLS );
+SERVICE( XMLDrawMetaExportOOO, "com.sun.star.comp.Draw.XMLMetaExporter", "XMLDrawMetaExportOOO", true, SvXMLExportFlags::META );
+SERVICE( XMLDrawSettingsExportOOO, "com.sun.star.comp.Draw.XMLSettingsExporter", "XMLDrawSettingsExportOOO", true, SvXMLExportFlags::SETTINGS );
+
+SERVICE( XMLDrawingLayerExport, "com.sun.star.comp.DrawingLayer.XMLExporter", "XMLDrawingLayerExport", true, SvXMLExportFlags::OASIS|SvXMLExportFlags::STYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::EMBEDDED );
+SERVICE( XMLImpressClipboardExport, "com.sun.star.comp.Impress.XMLClipboardExporter", "XMLImpressClipboardExport", false, SvXMLExportFlags::OASIS|SvXMLExportFlags::STYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::EMBEDDED );
 
 XMLFontAutoStylePool* SdXMLExport::CreateFontAutoStylePool()
 {
     bool bEmbedFonts = false;
-    if (getExportFlags() & EXPORT_CONTENT)
+    if (getExportFlags() & SvXMLExportFlags::CONTENT)
     {
         Reference< lang::XMultiServiceFactory > xFac( GetModel(), UNO_QUERY );
         if( xFac.is() )
diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx
index 6b7dcd163c96..cff480cb0a8f 100644
--- a/xmloff/source/draw/sdxmlexp_impl.hxx
+++ b/xmloff/source/draw/sdxmlexp_impl.hxx
@@ -172,7 +172,7 @@ public:
     SdXMLExport(
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
         OUString const & implementationName,
-        bool bIsDraw, sal_uInt16 nExportFlags = EXPORT_ALL );
+        bool bIsDraw, SvXMLExportFlags nExportFlags = SvXMLExportFlags::ALL );
     virtual ~SdXMLExport();
 
     void SetProgress(sal_Int32 nProg);
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 4981626aa273..f812badef54b 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -192,7 +192,7 @@ uno::Reference< drawing::XShape > XMLShapeExport::checkForCustomShapeReplacement
 {
     uno::Reference< drawing::XShape > xCustomShapeReplacement;
 
-    if( ( GetExport().getExportFlags() & EXPORT_OASIS ) == 0 )
+    if( !( GetExport().getExportFlags() & SvXMLExportFlags::OASIS ) )
     {
         OUString aType( xShape->getShapeType() );
         if( aType == "com.sun.star.drawing.CustomShape" )
@@ -661,7 +661,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
         if ( ( GetExport().GetModelType() != SvtModuleOptions::E_WRITER &&
                GetExport().GetModelType() != SvtModuleOptions::E_WRITERWEB &&
                GetExport().GetModelType() != SvtModuleOptions::E_WRITERGLOBAL ) ||
-             ( GetExport().getExportFlags() & EXPORT_OASIS ) != 0 ||
+             !( GetExport().getExportFlags() & SvXMLExportFlags::OASIS ) ||
              aShapeInfo.meShapeType == XmlShapeTypeDrawGroupShape ||
              ( aShapeInfo.meShapeType == XmlShapeTypeDrawCustomShape &&
                aShapeInfo.xCustomShapeReplacement.is() ) )
@@ -1330,7 +1330,7 @@ void XMLShapeExport::ImpExportNewTrans_GetB2DHomMatrix(::basegfx::B2DHomMatrix&
        the OASIS Open Office file format to the OpenOffice.org file format. (#i28749#)
     */
     uno::Any aAny;
-    if ( ( GetExport().getExportFlags() & EXPORT_OASIS ) == 0 &&
+    if ( !( GetExport().getExportFlags() & SvXMLExportFlags::OASIS ) &&
          xPropSet->getPropertySetInfo()->hasPropertyByName("TransformationInHoriL2R") )
     {
         aAny = xPropSet->getPropertyValue("TransformationInHoriL2R");
@@ -2262,7 +2262,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape(
         SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW,
                                   XML_FRAME, bCreateNewline, true );
 
-        const bool bSaveBackwardsCompatible = ( mrExport.getExportFlags() & EXPORT_SAVEBACKWARDCOMPATIBLE );
+        const bool bSaveBackwardsCompatible = bool( mrExport.getExportFlags() & SvXMLExportFlags::SAVEBACKWARDCOMPATIBLE );
 
         if( !bIsEmptyPresObj || bSaveBackwardsCompatible )
         {
@@ -2488,7 +2488,7 @@ void XMLShapeExport::ImpExportConnectorShape(
        direction the shape is in. Thus, this code provides the conversion from
        the OASIS Open Office file format to the OpenOffice.org file format. (#i36248#)
     */
-    if ( ( GetExport().getExportFlags() & EXPORT_OASIS ) == 0 &&
+    if ( !( GetExport().getExportFlags() & SvXMLExportFlags::OASIS ) &&
          xProps->getPropertySetInfo()->hasPropertyByName("StartPositionInHoriL2R") &&
          xProps->getPropertySetInfo()->hasPropertyByName("EndPositionInHoriL2R") )
     {
@@ -2660,7 +2660,7 @@ void XMLShapeExport::ImpExportMeasureShape(
        direction the shape is in. Thus, this code provides the conversion from
        the OASIS Open Office file format to the OpenOffice.org file format. (#i36248#)
     */
-    if ( ( GetExport().getExportFlags() & EXPORT_OASIS ) == 0 &&
+    if ( !( GetExport().getExportFlags() & SvXMLExportFlags::OASIS ) &&
          xProps->getPropertySetInfo()->hasPropertyByName("StartPositionInHoriL2R") &&
          xProps->getPropertySetInfo()->hasPropertyByName("EndPositionInHoriL2R") )
     {
@@ -2755,12 +2755,12 @@ void XMLShapeExport::ImpExportOLE2Shape(
             bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_TABLE) );
 
         bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
-        bool bExportEmbedded(0 != (mrExport.getExportFlags() & EXPORT_EMBEDDED));
+        bool bExportEmbedded(mrExport.getExportFlags() & SvXMLExportFlags::EMBEDDED);
         OUString sPersistName;
         SvXMLElementExport aElement( mrExport, XML_NAMESPACE_DRAW,
                                   XML_FRAME, bCreateNewline, true );
 
-        const bool bSaveBackwardsCompatible = ( mrExport.getExportFlags() & EXPORT_SAVEBACKWARDCOMPATIBLE );
+        const bool bSaveBackwardsCompatible = bool( mrExport.getExportFlags() & SvXMLExportFlags::SAVEBACKWARDCOMPATIBLE );
 
         if( !bIsEmptyPresObj || bSaveBackwardsCompatible )
         {
@@ -2855,7 +2855,7 @@ void XMLShapeExport::ImpExportOLE2Shape(
                     // in case it is not an OASIS format the object should be asked to store replacement image if possible
 
                     OUString sURLRequest( sURL );
-                    if ( ( mrExport.getExportFlags() & EXPORT_OASIS ) == 0 )
+                    if ( !( mrExport.getExportFlags() & SvXMLExportFlags::OASIS ) )
                         sURLRequest +=  "?oasis=false";
                     mrExport.AddEmbeddedObjectAsBase64( sURLRequest );
                 }
@@ -4896,7 +4896,7 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape
             bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_TABLE) );
 
         const bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 );
-        const bool bExportEmbedded(0 != (mrExport.getExportFlags() & EXPORT_EMBEDDED));
+        const bool bExportEmbedded(mrExport.getExportFlags() & SvXMLExportFlags::EMBEDDED);
 
         SvXMLElementExport aElement( mrExport, XML_NAMESPACE_DRAW, XML_FRAME, bCreateNewline, true );
 
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx
index f4117f84f52e..e67f3ba38671 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -44,7 +44,7 @@ using namespace ::xmloff::token;
 
 XMLMetaExportComponent::XMLMetaExportComponent(
     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
-    OUString const & implementationName, sal_uInt16 nFlags )
+    OUString const & implementationName, SvXMLExportFlags nFlags )
 :   SvXMLExport( util::MeasureUnit::CM, xContext, implementationName, XML_TEXT, nFlags )
 {
 }
@@ -74,7 +74,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum )
 {
     uno::Reference< xml::sax::XDocumentHandler > xDocHandler = GetDocHandler();
 
-    if( (getExportFlags() & EXPORT_OASIS) == 0 )
+    if( !(getExportFlags() & SvXMLExportFlags::OASIS) )
     {
         uno::Reference< uno::XComponentContext > xContext = getComponentContext();
         try
@@ -200,7 +200,7 @@ uno::Reference< uno::XInterface > SAL_CALL XMLMetaExportComponent_createInstance
         const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
     throw( uno::Exception )
 {
-    return (cppu::OWeakObject*)new XMLMetaExportComponent( comphelper::getComponentContext(rSMgr), XMLMetaExportComponent_getImplementationName(), EXPORT_META|EXPORT_OASIS);
+    return (cppu::OWeakObject*)new XMLMetaExportComponent( comphelper::getComponentContext(rSMgr), XMLMetaExportComponent_getImplementationName(), SvXMLExportFlags::META|SvXMLExportFlags::OASIS);
 }
 
 uno::Sequence< OUString > SAL_CALL XMLMetaExportOOO_getSupportedServiceNames()
@@ -221,7 +221,7 @@ uno::Reference< uno::XInterface > SAL_CALL XMLMetaExportOOO_createInstance(
         const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
     throw( uno::Exception )
 {
-    return (cppu::OWeakObject*)new XMLMetaExportComponent( comphelper::getComponentContext(rSMgr), XMLMetaExportOOO_getImplementationName(), EXPORT_META);
+    return (cppu::OWeakObject*)new XMLMetaExportComponent( comphelper::getComponentContext(rSMgr), XMLMetaExportOOO_getImplementationName(), SvXMLExportFlags::META);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx
index b3dd0f648de9..5a54f78d0d04 100644
--- a/xmloff/source/style/impastpl.cxx
+++ b/xmloff/source/style/impastpl.cxx
@@ -409,8 +409,8 @@ void SvXMLAutoStylePoolP_Impl::AddFamily(
         bool bAsFamily )
 {
     // store family in a list if not already stored
-    sal_uInt16 nExportFlags = GetExport().getExportFlags();
-    bool bStylesOnly = (nExportFlags & EXPORT_STYLES) != 0 && (nExportFlags & EXPORT_CONTENT) == 0;
+    SvXMLExportFlags nExportFlags = GetExport().getExportFlags();
+    bool bStylesOnly = (nExportFlags & SvXMLExportFlags::STYLES) && !(nExportFlags & SvXMLExportFlags::CONTENT);
 
     OUString aPrefix( rStrPrefix );
     if( bStylesOnly )
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index 6396e1644d9c..2089fb08748c 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -191,7 +191,7 @@ bool XMLStyleExport::exportStyle(
                 /* Empty value for style:default-outline-level does exist
                    since ODF 1.2. Thus, suppress its export for former versions. (#i104889#)
                 */
-                if ( ( GetExport().getExportFlags() & EXPORT_OASIS ) != 0 &&
+                if ( ( GetExport().getExportFlags() & SvXMLExportFlags::OASIS ) &&
                      GetExport().getDefaultVersion() >= SvtSaveOptions::ODFVER_012 )
                 {
                     GetExport().AddAttribute( XML_NAMESPACE_STYLE,
diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx
index 19ee4a6642d6..d0c3ff8de74a 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.cxx
@@ -61,7 +61,7 @@ using ::com::sun::star::xml::sax::XDocumentHandler;
 
 XMLAutoTextEventExport::XMLAutoTextEventExport(
     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
-    OUString const & implementationName, sal_uInt16 nFlags
+    OUString const & implementationName, SvXMLExportFlags nFlags
     )
 :   SvXMLExport(util::MeasureUnit::INCH, xContext, implementationName, XML_AUTO_TEXT, nFlags)
 {
@@ -106,7 +106,7 @@ void XMLAutoTextEventExport::initialize(
 
 sal_uInt32 XMLAutoTextEventExport::exportDoc( enum XMLTokenEnum )
 {
-    if( (getExportFlags() & EXPORT_OASIS) == 0 )
+    if( !(getExportFlags() & SvXMLExportFlags::OASIS) )
     {
         Reference< uno::XComponentContext> xContext = getComponentContext();
         try
@@ -226,7 +226,7 @@ Reference< XInterface > SAL_CALL XMLAutoTextEventExport_createInstance(
         const Reference< XMultiServiceFactory > & rSMgr)
     throw( Exception )
 {
-    return (cppu::OWeakObject*)new XMLAutoTextEventExport( comphelper::getComponentContext(rSMgr), XMLAutoTextEventExport_getImplementationName(), EXPORT_ALL|EXPORT_OASIS);
+    return (cppu::OWeakObject*)new XMLAutoTextEventExport( comphelper::getComponentContext(rSMgr), XMLAutoTextEventExport_getImplementationName(), SvXMLExportFlags::ALL|SvXMLExportFlags::OASIS);
 }
 
 // methods to support the component registration
@@ -248,7 +248,7 @@ Reference< XInterface > SAL_CALL XMLAutoTextEventExportOOO_createInstance(
         const Reference< XMultiServiceFactory > & rSMgr)
     throw( Exception )
 {
-    return (cppu::OWeakObject*)new XMLAutoTextEventExport( comphelper::getComponentContext(rSMgr), XMLAutoTextEventExportOOO_getImplementationName(), EXPORT_ALL);
+    return (cppu::OWeakObject*)new XMLAutoTextEventExport( comphelper::getComponentContext(rSMgr), XMLAutoTextEventExportOOO_getImplementationName(), SvXMLExportFlags::ALL);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLAutoTextEventExport.hxx b/xmloff/source/text/XMLAutoTextEventExport.hxx
index 39cc9a103133..61206832d91d 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.hxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.hxx
@@ -52,7 +52,7 @@ class XMLAutoTextEventExport : public SvXMLExport
 public:
 
     XMLAutoTextEventExport(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, OUString const & implementationName, sal_uInt16 nFlags
+        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, OUString const & implementationName, SvXMLExportFlags nFlags
         );
 
     virtual ~XMLAutoTextEventExport();
diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx
index 2ffe6887b8b5..fd976361e866 100644
--- a/xmloff/source/text/XMLTextListAutoStylePool.cxx
+++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx
@@ -146,8 +146,8 @@ XMLTextListAutoStylePool::XMLTextListAutoStylePool( SvXMLExport& rExp ) :
     Reference<ucb::XAnyCompareFactory> xCompareFac( rExp.GetModel(), uno::UNO_QUERY );
     if( xCompareFac.is() )
         mxNumRuleCompare = xCompareFac->createAnyCompareByName( OUString( "NumberingRules" ) );
-    sal_uInt16 nExportFlags = rExport.getExportFlags();
-    bool bStylesOnly = (nExportFlags & EXPORT_STYLES) != 0 && (nExportFlags & EXPORT_CONTENT) == 0;
+    SvXMLExportFlags nExportFlags = rExport.getExportFlags();
+    bool bStylesOnly = (nExportFlags & SvXMLExportFlags::STYLES) && !(nExportFlags & SvXMLExportFlags::CONTENT);
     if( bStylesOnly )
         sPrefix = "ML";
 
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index 2b969cfc3451..dbe9f0c2825f 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -1048,7 +1048,7 @@ void XMLTextExportPropertySetMapper::ContextFilter(
 
     // States for shape positioning properties (#i28749#)
     if ( eAnchor != TextContentAnchorType_AS_CHARACTER &&
-         ( GetExport().getExportFlags() & EXPORT_OASIS ) == 0 )
+         !( GetExport().getExportFlags() & SvXMLExportFlags::OASIS ) )
     {
         // no export of shape positioning properties,
         // if shape isn't anchored as-character and
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 805e0e6ab399..837ebe65ffec 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -1118,7 +1118,7 @@ void XMLTextFieldExport::ExportFieldHelper(
         bool bCmd = GetBoolProperty(sPropertyIsShowFormula, rPropSet);
         ProcessDisplay(true, bCmd);
         // #i81766# for older versions export of the value-type
-        bool bExportValueType = !bCmd && ( GetExport().getExportFlags() & EXPORT_SAVEBACKWARDCOMPATIBLE );
+        bool bExportValueType = !bCmd && ( GetExport().getExportFlags() & SvXMLExportFlags::SAVEBACKWARDCOMPATIBLE );
         // show style, unless name will be shown
         ProcessValueAndType(IsStringField(nToken, rPropSet),
                             GetIntProperty(sPropertyNumberFormat, rPropSet),
@@ -1358,7 +1358,7 @@ void XMLTextFieldExport::ExportFieldHelper(
                       sPresentation);
         sal_Int32 nDummy = 0; // MapPageNumberName need int
         ProcessString(XML_SELECT_PAGE, MapPageNumberName(rPropSet, nDummy));
-        if( 0 == ( GetExport().getExportFlags() & EXPORT_SAVEBACKWARDCOMPATIBLE ) )
+        if( !( GetExport().getExportFlags() & SvXMLExportFlags::SAVEBACKWARDCOMPATIBLE ) )
             ExportElement(XML_PAGE_CONTINUATION, sPresentation);
         else
             ExportElement(XML_PAGE_CONTINUATION_STRING, sPresentation);
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 4ab4c30d8f06..f23a34051430 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -836,7 +836,7 @@ void XMLTextParagraphExport::exportListChange(
     }
 
     const bool bExportODF =
-                ( GetExport().getExportFlags() & EXPORT_OASIS ) != 0;
+                bool( GetExport().getExportFlags() & SvXMLExportFlags::OASIS );
     const SvtSaveOptions::ODFDefaultVersion eODFDefaultVersion =
                                     GetExport().getDefaultVersion();
 
@@ -1097,7 +1097,7 @@ void XMLTextParagraphExport::exportListChange(
             GetExport().AddAttribute( XML_NAMESPACE_TEXT, XML_START_VALUE,
                                       aBuffer.makeStringAndClear() );
         }
-        if ( ( GetExport().getExportFlags() & EXPORT_OASIS ) != 0 &&
+        if ( ( GetExport().getExportFlags() & SvXMLExportFlags::OASIS ) &&
              GetExport().getDefaultVersion() >= SvtSaveOptions::ODFVER_012 )
         {
             const OUString sListStyleName( rNextInfo.GetNumRulesName() );