From ec5bf66d366cd42774a87465e1187271f48a4ab1 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 25 Dec 2014 17:43:19 +0200 Subject: fdo#84938: convert XML_EXPORT_FLAG_ to 'enum class' Change-Id: I43d778e0eee19a56ea37898ec1c4309d3407775e --- include/xmloff/xmlexppr.hxx | 36 +++++++++++++--------- sc/source/filter/xml/xmlstyle.cxx | 2 +- sc/source/filter/xml/xmlstyle.hxx | 2 +- sw/source/filter/xml/xmlexpit.cxx | 22 ++++++------- sw/source/filter/xml/xmlexpit.hxx | 20 +++++------- sw/source/filter/xml/xmlfmte.cxx | 2 +- sw/source/filter/xml/xmliteme.cxx | 4 +-- xmloff/inc/XMLChartPropertySetMapper.hxx | 2 +- xmloff/source/chart/PropertyMaps.cxx | 2 +- xmloff/source/draw/sdpropls.cxx | 4 +-- xmloff/source/draw/sdpropls.hxx | 4 +-- xmloff/source/style/PageMasterExportPropMapper.cxx | 2 +- xmloff/source/style/PageMasterExportPropMapper.hxx | 2 +- xmloff/source/style/XMLPageExport.cxx | 2 +- xmloff/source/style/impastpl.cxx | 2 +- xmloff/source/style/styleexp.cxx | 4 +-- xmloff/source/style/xmlaustp.cxx | 4 +-- xmloff/source/style/xmlexppr.cxx | 16 +++++----- xmloff/source/text/txtexppr.cxx | 2 +- xmloff/source/text/txtexppr.hxx | 2 +- 20 files changed, 69 insertions(+), 67 deletions(-) diff --git a/include/xmloff/xmlexppr.hxx b/include/xmloff/xmlexppr.hxx index 97d050072f1a..dad0faa8b655 100644 --- a/include/xmloff/xmlexppr.hxx +++ b/include/xmloff/xmlexppr.hxx @@ -25,15 +25,23 @@ #include #include #include +#include #include -#define XML_EXPORT_FLAG_DEFAULTS 0x0001 // export also default items -#define XML_EXPORT_FLAG_DEEP 0x0002 // export also items from - // parent item sets -#define XML_EXPORT_FLAG_EMPTY 0x0004 // export attribs element - // even if its empty -#define XML_EXPORT_FLAG_IGN_WS 0x0008 +enum class SvXmlExportFlags { + NONE = 0x0000, + DEFAULTS = 0x0001, // export also default items + DEEP = 0x0002, // export also items from + // parent item sets + EMPTY = 0x0004, // export attribs element + // even if its empty + IGN_WS = 0x0008 +}; +namespace o3tl +{ + template<> struct typed_flags : is_typed_flags {}; +} class SvXMLUnitConverter; class SvXMLAttributeList; @@ -71,7 +79,7 @@ protected: const ::std::vector< XMLPropertyState >& rProperties, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, - sal_uInt16 nFlags, + SvXmlExportFlags nFlags, std::vector* pIndexArray, sal_Int32 nPropMapStartIdx, sal_Int32 nPropMapEndIdx ) const; @@ -79,14 +87,14 @@ protected: const XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, - sal_uInt16 nFlags, + SvXmlExportFlags nFlags, const ::std::vector< XMLPropertyState > *pProperties = 0, sal_uInt32 nIdx = 0 ) const; void exportElementItems( SvXMLExport& rExport, const ::std::vector< XMLPropertyState >& rProperties, - sal_uInt16 nFlags, + SvXmlExportFlags nFlags, const std::vector& rIndexArray ) const; public: @@ -129,7 +137,7 @@ public: const ::std::vector< XMLPropertyState >& rProperties, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, - sal_uInt16 nFlags = 0 ) const; + SvXmlExportFlags nFlags = SvXmlExportFlags::NONE ) const; /** like above but only properties whose property map index is within the specified range are exported */ void exportXML( @@ -138,12 +146,12 @@ public: const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, sal_Int32 nPropMapStartIdx, sal_Int32 nPropMapEndIdx, - sal_uInt16 nFlags = 0 ) const; + SvXmlExportFlags nFlags = SvXmlExportFlags::NONE ) const; void exportXML( SvXMLExport& rExport, const ::std::vector< XMLPropertyState >& rProperties, - sal_uInt16 nFlags = 0 ) const; + SvXmlExportFlags nFlags = SvXmlExportFlags::NONE ) const; /** like above but only properties whose property map index is within the * specified range are exported @@ -154,14 +162,14 @@ public: SvXMLExport& rExport, const ::std::vector< XMLPropertyState >& rProperties, sal_Int32 nPropMapStartIdx, sal_Int32 nPropMapEndIdx, - sal_uInt16 nFlags = 0, bool bExtensionNamespace = false ) const; + SvXmlExportFlags nFlags = SvXmlExportFlags::NONE, bool bExtensionNamespace = false ) const; /** this method is called for every item that has the MID_FLAG_ELEMENT_EXPORT flag set */ virtual void handleElementItem( SvXMLExport& rExport, const XMLPropertyState& rProperty, - sal_uInt16 nFlags, + SvXmlExportFlags nFlags, const ::std::vector< XMLPropertyState > *pProperties = 0, sal_uInt32 nIdx = 0 ) const; diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index cf6ed807d61b..70191e57c524 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -526,7 +526,7 @@ void ScXMLCellExportPropertyMapper::handleSpecialItem( void ScXMLCellExportPropertyMapper::handleElementItem( SvXMLExport& rExport, const XMLPropertyState& rProperty, - sal_uInt16 /* nFlags */, + SvXmlExportFlags /* nFlags */, const ::std::vector< XMLPropertyState > * /* pProperties */, sal_uInt32 /* nIdx */) const { diff --git a/sc/source/filter/xml/xmlstyle.hxx b/sc/source/filter/xml/xmlstyle.hxx index 5e625b0abc31..1b458b5343e8 100644 --- a/sc/source/filter/xml/xmlstyle.hxx +++ b/sc/source/filter/xml/xmlstyle.hxx @@ -118,7 +118,7 @@ public: virtual void handleElementItem( SvXMLExport& rExport, const XMLPropertyState& rProperty, - sal_uInt16 nFlags, + SvXmlExportFlags nFlags, const ::std::vector< XMLPropertyState > *pProperties = 0, sal_uInt32 nIdx = 0 ) const SAL_OVERRIDE; diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index 40253feaeaf5..d8415d4ccf26 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -64,7 +64,7 @@ void SvXMLExportItemMapper::exportXML( const SvXMLExport& rExport, const SfxItemSet& rSet, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, - sal_uInt16 nFlags, + SvXmlExportFlags nFlags, std::vector *pIndexArray ) const { const sal_uInt16 nCount = mrMapEntries->getCount(); @@ -112,7 +112,7 @@ void SvXMLExportItemMapper::exportXML( const SvXMLExport& rExport, const SvXMLItemMapEntry& rEntry, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, - sal_uInt16 /*nFlags*/, + SvXmlExportFlags /*nFlags*/, const SfxItemSet *pSet ) const { if( 0 != (rEntry.nMemberId & MID_SW_FLAG_SPECIAL_ITEM_EXPORT) ) @@ -219,7 +219,7 @@ void SvXMLExportItemMapper::exportElementItems( SvXMLExport& rExport, const SvXMLUnitConverter& rUnitConverter, const SfxItemSet &rSet, - sal_uInt16 nFlags, + SvXmlExportFlags nFlags, const std::vector &rIndexArray ) const { const size_t nCount = rIndexArray.size(); @@ -248,25 +248,25 @@ void SvXMLExportItemMapper::exportElementItems( } /** returns the item with the given WhichId from the given ItemSet if its - set or its default item if its not set and the XML_EXPORT_FLAG_DEEP + set or its default item if its not set and the SvXmlExportFlags::DEEP is set in the flags */ const SfxPoolItem* SvXMLExportItemMapper::GetItem( const SfxItemSet& rSet, sal_uInt16 nWhichId, - sal_uInt16 nFlags ) + SvXmlExportFlags nFlags ) { // first get item from itemset const SfxPoolItem* pItem; SfxItemState eState = rSet.GetItemState( nWhichId, - ( nFlags & XML_EXPORT_FLAG_DEEP ) != 0, + bool( nFlags & SvXmlExportFlags::DEEP ), &pItem ); if( SfxItemState::SET == eState ) { return pItem; } - else if( (nFlags & XML_EXPORT_FLAG_DEFAULTS) != 0 && + else if( (nFlags & SvXmlExportFlags::DEFAULTS) && SFX_WHICH_MAX > nWhichId ) { // if its not set, try the pool if we export defaults @@ -291,7 +291,7 @@ void SvXMLExportItemMapper::exportXML( SvXMLExport& rExport, const SfxItemSet& rSet, const SvXMLUnitConverter& rUnitConverter, XMLTokenEnum ePropToken, - sal_uInt16 nFlags ) const + SvXmlExportFlags nFlags ) const { std::vector aIndexArray; @@ -299,10 +299,10 @@ void SvXMLExportItemMapper::exportXML( SvXMLExport& rExport, rExport.GetNamespaceMap(), nFlags, &aIndexArray ); if( rExport.GetAttrList().getLength() > 0L || - (nFlags & XML_EXPORT_FLAG_EMPTY) != 0 || + (nFlags & SvXmlExportFlags::EMPTY) || !aIndexArray.empty() ) { - if( (nFlags & XML_EXPORT_FLAG_IGN_WS) != 0 ) + if( (nFlags & SvXmlExportFlags::IGN_WS) ) { rExport.IgnorableWhitespace(); } @@ -345,7 +345,7 @@ void SvXMLExportItemMapper::handleElementItem( const SfxPoolItem& /*rItem*/, const SvXMLUnitConverter& /*rUnitConverter*/, const SfxItemSet& /*rSet*/, - sal_uInt16 /*nFlags*/ ) const + SvXmlExportFlags /*nFlags*/ ) const { OSL_FAIL( "element item not handled in xml export" ); } diff --git a/sw/source/filter/xml/xmlexpit.hxx b/sw/source/filter/xml/xmlexpit.hxx index a017fffb19ef..d3c37d4d5a13 100644 --- a/sw/source/filter/xml/xmlexpit.hxx +++ b/sw/source/filter/xml/xmlexpit.hxx @@ -21,16 +21,10 @@ #define INCLUDED_SW_SOURCE_FILTER_XML_XMLEXPIT_HXX #include +#include #include "xmlitmap.hxx" #include -#define XML_EXPORT_FLAG_DEFAULTS 0x0001 // export also default items -#define XML_EXPORT_FLAG_DEEP 0x0002 // export also items from - // parent item sets -#define XML_EXPORT_FLAG_EMPTY 0x0004 // export attribs element - // even if its empty -#define XML_EXPORT_FLAG_IGN_WS 0x0008 - class SvXMLUnitConverter; class SfxPoolItem; class SfxItemSet; @@ -49,7 +43,7 @@ protected: const SfxItemSet& rSet, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, - sal_uInt16 nFlags, + SvXmlExportFlags nFlags, std::vector *pIndexArray ) const; void exportXML( const SvXMLExport& rExport, @@ -58,18 +52,18 @@ protected: const SvXMLItemMapEntry &rEntry, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, - sal_uInt16 nFlags, + SvXmlExportFlags nFlags, const SfxItemSet *pSet ) const; void exportElementItems( SvXMLExport& rExport, const SvXMLUnitConverter& rUnitConverter, const SfxItemSet &rSet, - sal_uInt16 nFlags, + SvXmlExportFlags nFlags, const std::vector &rIndexArray ) const; static const SfxPoolItem* GetItem( const SfxItemSet &rSet, sal_uInt16 nWhichId, - sal_uInt16 nFlags ); + SvXmlExportFlags nFlags ); public: SvXMLExportItemMapper( SvXMLItemMapEntriesRef rMapEntries ); @@ -79,7 +73,7 @@ public: const SfxItemSet& rSet, const SvXMLUnitConverter& rUnitConverter, ::xmloff::token::XMLTokenEnum ePropToken, - sal_uInt16 nFlags = 0 ) const; + SvXmlExportFlags nFlags = SvXmlExportFlags::NONE ) const; /** this method is called for every item that has the MID_SW_FLAG_SPECIAL_ITEM_EXPORT flag set */ @@ -105,7 +99,7 @@ public: const SfxPoolItem& rItem, const SvXMLUnitConverter& rUnitConverter, const SfxItemSet& rSet, - sal_uInt16 nFlags ) const; + SvXmlExportFlags nFlags ) const; inline void setMapEntries( SvXMLItemMapEntriesRef rMapEntries ); diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index d34ca353b6b7..df323eb743e3 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -155,7 +155,7 @@ void SwXMLExport::ExportFmt( const SwFmt& rFmt, enum XMLTokenEnum eFamily ) rFmt.GetAttrSet(), GetTwipUnitConverter(), ePropToken, - XML_EXPORT_FLAG_IGN_WS ); + SvXmlExportFlags::IGN_WS ); } } } diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx index a740898ba094..eb3307f086b1 100644 --- a/sw/source/filter/xml/xmliteme.cxx +++ b/sw/source/filter/xml/xmliteme.cxx @@ -83,7 +83,7 @@ public: const SfxPoolItem& rItem, const SvXMLUnitConverter& rUnitConverter, const SfxItemSet& rSet, - sal_uInt16 nFlags ) const SAL_OVERRIDE; + SvXmlExportFlags nFlags ) const SAL_OVERRIDE; inline void SetAbsWidth( sal_uInt32 nAbs ); }; @@ -196,7 +196,7 @@ void SwXMLTableItemMapper_Impl::handleElementItem( const SfxPoolItem& rItem, const SvXMLUnitConverter& /*rUnitConverter*/, const SfxItemSet&, - sal_uInt16 ) const + SvXmlExportFlags ) const { switch( rEntry.nWhichId ) { diff --git a/xmloff/inc/XMLChartPropertySetMapper.hxx b/xmloff/inc/XMLChartPropertySetMapper.hxx index 158bfcf47d7d..7ead99500a84 100644 --- a/xmloff/inc/XMLChartPropertySetMapper.hxx +++ b/xmloff/inc/XMLChartPropertySetMapper.hxx @@ -65,7 +65,7 @@ private: /// this method is called for every item that has the MID_FLAG_ELEMENT_EXPORT flag set virtual void handleElementItem( SvXMLExport& rExport, - const XMLPropertyState& rProperty, sal_uInt16 nFlags, + const XMLPropertyState& rProperty, SvXmlExportFlags nFlags, const ::std::vector< XMLPropertyState > *pProperties = 0, sal_uInt32 nIdx = 0 ) const SAL_OVERRIDE; diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx index aea50b0310e9..6784a4cf68bb 100644 --- a/xmloff/source/chart/PropertyMaps.cxx +++ b/xmloff/source/chart/PropertyMaps.cxx @@ -292,7 +292,7 @@ void XMLChartExportPropertyMapper::ContextFilter( void XMLChartExportPropertyMapper::handleElementItem( SvXMLExport& rExport, - const XMLPropertyState& rProperty, sal_uInt16 nFlags, + const XMLPropertyState& rProperty, SvXmlExportFlags nFlags, const ::std::vector< XMLPropertyState > *pProperties, sal_uInt32 nIdx ) const { diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 27b2de078f69..04d579811750 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -1532,7 +1532,7 @@ void XMLShapeExportPropertyMapper::handleSpecialItem( void XMLShapeExportPropertyMapper::handleElementItem( SvXMLExport& rExport, const XMLPropertyState& rProperty, - sal_uInt16 nFlags, + SvXmlExportFlags nFlags, const ::std::vector< XMLPropertyState > *pProperties, sal_uInt32 nIdx) const { @@ -1717,7 +1717,7 @@ void XMLPageExportPropertyMapper::ContextFilter( void XMLPageExportPropertyMapper::handleElementItem( SvXMLExport& rExport, const XMLPropertyState& rProperty, - sal_uInt16 nFlags, + SvXmlExportFlags nFlags, const ::std::vector< XMLPropertyState > *pProperties, sal_uInt32 nIdx) const { diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx index a60651504d0b..8a833ec68b1a 100644 --- a/xmloff/source/draw/sdpropls.hxx +++ b/xmloff/source/draw/sdpropls.hxx @@ -92,7 +92,7 @@ public: virtual void handleElementItem( SvXMLExport& rExport, const XMLPropertyState& rProperty, - sal_uInt16 nFlags, + SvXmlExportFlags nFlags, const ::std::vector< XMLPropertyState >* pProperties = 0, sal_uInt32 nIdx = 0 ) const SAL_OVERRIDE; @@ -126,7 +126,7 @@ public: virtual void handleElementItem( SvXMLExport& rExport, const XMLPropertyState& rProperty, - sal_uInt16 nFlags, + SvXmlExportFlags nFlags, const ::std::vector< XMLPropertyState >* pProperties = 0, sal_uInt32 nIdx = 0 ) const SAL_OVERRIDE; diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx index 6c67709529b7..689fd5e76c50 100644 --- a/xmloff/source/style/PageMasterExportPropMapper.cxx +++ b/xmloff/source/style/PageMasterExportPropMapper.cxx @@ -230,7 +230,7 @@ XMLPageMasterExportPropMapper::~XMLPageMasterExportPropMapper() void XMLPageMasterExportPropMapper::handleElementItem( SvXMLExport&, const XMLPropertyState& rProperty, - sal_uInt16 /*nFlags*/, + SvXmlExportFlags /*nFlags*/, const ::std::vector< XMLPropertyState >* pProperties, sal_uInt32 nIdx ) const { diff --git a/xmloff/source/style/PageMasterExportPropMapper.hxx b/xmloff/source/style/PageMasterExportPropMapper.hxx index a06cb48135d3..c2699a607960 100644 --- a/xmloff/source/style/PageMasterExportPropMapper.hxx +++ b/xmloff/source/style/PageMasterExportPropMapper.hxx @@ -48,7 +48,7 @@ public: virtual void handleElementItem( SvXMLExport& rExport, const XMLPropertyState& rProperty, - sal_uInt16 nFlags, + SvXmlExportFlags nFlags, const ::std::vector< XMLPropertyState >* pProperties = 0, sal_uInt32 nIdx = 0 ) const SAL_OVERRIDE; diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx index 8cdcabd08782..2c6fe9c9ad04 100644 --- a/xmloff/source/style/XMLPageExport.cxx +++ b/xmloff/source/style/XMLPageExport.cxx @@ -256,7 +256,7 @@ void XMLPageExport::exportDefaultStyle() true, true ); xPageMasterExportPropMapper->exportXML( GetExport(), xPropStates, - XML_EXPORT_FLAG_IGN_WS ); + SvXmlExportFlags::IGN_WS ); } } } diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx index 40b592ec033e..b3dd0f648de9 100644 --- a/xmloff/source/style/impastpl.cxx +++ b/xmloff/source/style/impastpl.cxx @@ -760,7 +760,7 @@ void SvXMLAutoStylePoolP_Impl::exportXML( rFamily.mxMapper->exportXML( GetExport(), aExpStyles[i].mpProperties->GetProperties(), - nStart, nEnd, XML_EXPORT_FLAG_IGN_WS, bExtensionNamespace ); + nStart, nEnd, SvXmlExportFlags::IGN_WS, bExtensionNamespace ); pAntiImpl->exportStyleContent( GetExport().GetDocHandler(), diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx index bba026359e13..6396e1644d9c 100644 --- a/xmloff/source/style/styleexp.cxx +++ b/xmloff/source/style/styleexp.cxx @@ -321,7 +321,7 @@ bool XMLStyleExport::exportStyle( ::std::vector< XMLPropertyState > xPropStates = rPropMapper->Filter( xPropSet, true ); rPropMapper->exportXML( GetExport(), xPropStates, - XML_EXPORT_FLAG_IGN_WS ); + SvXmlExportFlags::IGN_WS ); rPropMapper->SetStyleName( OUString() ); @@ -358,7 +358,7 @@ bool XMLStyleExport::exportDefaultStyle( ::std::vector< XMLPropertyState > xPropStates = rPropMapper->FilterDefaults( xPropSet ); rPropMapper->exportXML( GetExport(), xPropStates, - XML_EXPORT_FLAG_IGN_WS ); + SvXmlExportFlags::IGN_WS ); } return true; } diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx index 3358486d75d8..96e71a189d47 100644 --- a/xmloff/source/style/xmlaustp.cxx +++ b/xmloff/source/style/xmlaustp.cxx @@ -245,7 +245,7 @@ void SvXMLAutoStylePoolP::exportStyleContent( rPropExp.exportXML( GetExport(), rProperties, - nHeaderStartIndex, nHeaderEndIndex, XML_EXPORT_FLAG_IGN_WS); + nHeaderStartIndex, nHeaderEndIndex, SvXmlExportFlags::IGN_WS); } // export footer style @@ -256,7 +256,7 @@ void SvXMLAutoStylePoolP::exportStyleContent( rPropExp.exportXML( GetExport(), rProperties, - nFooterStartIndex, nFooterEndIndex, XML_EXPORT_FLAG_IGN_WS); + nFooterStartIndex, nFooterEndIndex, SvXmlExportFlags::IGN_WS); } } } diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index 22cfe8aab264..ce43f2fa0b33 100644 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -749,7 +749,7 @@ void SvXMLExportPropertyMapper::exportXML( SvXMLAttributeList& rAttrList, void SvXMLExportPropertyMapper::exportXML( SvXMLExport& rExport, const ::std::vector< XMLPropertyState >& rProperties, - sal_uInt16 nFlags ) const + SvXmlExportFlags nFlags ) const { exportXML( rExport, rProperties, -1, -1, nFlags ); } @@ -758,7 +758,7 @@ void SvXMLExportPropertyMapper::exportXML( SvXMLExport& rExport, const ::std::vector< XMLPropertyState >& rProperties, sal_Int32 nPropMapStartIdx, sal_Int32 nPropMapEndIdx, - sal_uInt16 nFlags, bool bExtensionNamespace ) const + SvXmlExportFlags nFlags, bool bExtensionNamespace ) const { sal_uInt16 nPropTypeFlags = 0; for( sal_uInt16 i=0; i 0L || - (nFlags & XML_EXPORT_FLAG_EMPTY) != 0 || + (nFlags & SvXmlExportFlags::EMPTY) || !aIndexArray.empty() ) { sal_uInt16 nNamespace = XML_NAMESPACE_STYLE; @@ -785,7 +785,7 @@ void SvXMLExportPropertyMapper::exportXML( nNamespace = XML_NAMESPACE_LO_EXT; SvXMLElementExport aElem( rExport, nNamespace, aPropTokens[i].eToken, - (nFlags & XML_EXPORT_FLAG_IGN_WS) != 0, + bool(nFlags & SvXmlExportFlags::IGN_WS), false ); exportElementItems( rExport, rProperties, nFlags, aIndexArray ); @@ -815,7 +815,7 @@ void SvXMLExportPropertyMapper::handleSpecialItem( void SvXMLExportPropertyMapper::handleElementItem( SvXMLExport& rExport, const XMLPropertyState& rProperty, - sal_uInt16 nFlags, + SvXmlExportFlags nFlags, const ::std::vector< XMLPropertyState > *pProperties, sal_uInt32 nIdx ) const { @@ -833,7 +833,7 @@ void SvXMLExportPropertyMapper::_exportXML( const ::std::vector< XMLPropertyState >& rProperties, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, - sal_uInt16 nFlags, + SvXmlExportFlags nFlags, std::vector* pIndexArray, sal_Int32 nPropMapStartIdx, sal_Int32 nPropMapEndIdx ) const { @@ -885,7 +885,7 @@ void SvXMLExportPropertyMapper::_exportXML( const XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, - sal_uInt16 /*nFlags*/, + SvXmlExportFlags /*nFlags*/, const ::std::vector< XMLPropertyState > *pProperties, sal_uInt32 nIdx ) const { @@ -1020,7 +1020,7 @@ void SvXMLExportPropertyMapper::_exportXML( void SvXMLExportPropertyMapper::exportElementItems( SvXMLExport& rExport, const ::std::vector< XMLPropertyState >& rProperties, - sal_uInt16 nFlags, + SvXmlExportFlags nFlags, const std::vector& rIndexArray ) const { const sal_uInt16 nCount = rIndexArray.size(); diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx index 5fc9cc4b397b..2b969cfc3451 100644 --- a/xmloff/source/text/txtexppr.cxx +++ b/xmloff/source/text/txtexppr.cxx @@ -44,7 +44,7 @@ using namespace ::com::sun::star::text; void XMLTextExportPropertySetMapper::handleElementItem( SvXMLExport& rExp, const XMLPropertyState& rProperty, - sal_uInt16 nFlags, + SvXmlExportFlags nFlags, const ::std::vector< XMLPropertyState > *pProperties, sal_uInt32 nIdx ) const { diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx index 209914fa92e8..b0048429f2f7 100644 --- a/xmloff/source/text/txtexppr.hxx +++ b/xmloff/source/text/txtexppr.hxx @@ -73,7 +73,7 @@ public: virtual void handleElementItem( SvXMLExport& rExport, const XMLPropertyState& rProperty, - sal_uInt16 nFlags, + SvXmlExportFlags nFlags, const ::std::vector< XMLPropertyState > *pProperties = 0, sal_uInt32 nIdx = 0 ) const SAL_OVERRIDE; -- cgit v1.2.3