diff options
author | Noel Grandin <noel@peralex.com> | 2014-12-25 17:43:19 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-01-06 10:59:41 +0200 |
commit | ec5bf66d366cd42774a87465e1187271f48a4ab1 (patch) | |
tree | 753abf1bed73e17c23e3ff0bbfbca7ea27f3b31f /xmloff | |
parent | dc28e90d200a839d4017d548217ee5ce8a23f848 (diff) |
fdo#84938: convert XML_EXPORT_FLAG_ to 'enum class'
Change-Id: I43d778e0eee19a56ea37898ec1c4309d3407775e
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/inc/XMLChartPropertySetMapper.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/chart/PropertyMaps.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/sdpropls.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/draw/sdpropls.hxx | 4 | ||||
-rw-r--r-- | xmloff/source/style/PageMasterExportPropMapper.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/PageMasterExportPropMapper.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/XMLPageExport.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/impastpl.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/styleexp.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/style/xmlaustp.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/style/xmlexppr.cxx | 16 | ||||
-rw-r--r-- | xmloff/source/text/txtexppr.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/txtexppr.hxx | 2 |
13 files changed, 24 insertions, 24 deletions
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<MAX_PROP_TYPES; ++i ) @@ -776,7 +776,7 @@ void SvXMLExportPropertyMapper::exportXML( nPropMapStartIdx, nPropMapEndIdx ); if( rExport.GetAttrList().getLength() > 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<sal_uInt16>* 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<sal_uInt16>& 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; |