diff options
-rw-r--r-- | dbaccess/source/filter/xml/xmlExport.cxx | 2 | ||||
-rw-r--r-- | filter/source/svg/svgexport.cxx | 4 | ||||
-rw-r--r-- | include/xmloff/xmlexp.hxx | 2 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlExport.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlexprt.cxx | 4 | ||||
-rw-r--r-- | starmath/source/mathmlexport.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/xml/xmlexp.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLExport.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/core/xmlexp.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/sdxmlexp.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/meta/MetaExportComponent.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/XMLAutoTextEventExport.cxx | 2 |
12 files changed, 14 insertions, 14 deletions
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index 13b68d9f15bc..49e7f04a3c76 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -190,7 +190,7 @@ namespace dbaxml } ODBExport::ODBExport(const Reference< XComponentContext >& _rxContext, OUString const & implementationName, SvXMLExportFlags nExportFlag) -: SvXMLExport( util::MeasureUnit::MM_10TH, _rxContext, implementationName, XML_DATABASE, +: SvXMLExport( _rxContext, implementationName, util::MeasureUnit::MM_10TH, XML_DATABASE, SvXMLExportFlags::OASIS | nExportFlag) ,m_aTypeCollection(_rxContext) ,m_bAllreadyFilled(false) diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index e07ce224c1ea..76ad8c3b2ca2 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -324,8 +324,8 @@ SVGExport::SVGExport( const css::uno::Reference< css::uno::XComponentContext >& rContext, const Reference< XDocumentHandler >& rxHandler, const Sequence< PropertyValue >& rFilterData ) - : SvXMLExport( util::MeasureUnit::MM_100TH, - rContext, "", + : SvXMLExport( rContext, "", + util::MeasureUnit::MM_100TH, xmloff::token::XML_TOKEN_INVALID, SvXMLExportFlags::META|SvXMLExportFlags::PRETTY ) { diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx index 963bd3148cfc..eee53a95d91b 100644 --- a/include/xmloff/xmlexp.hxx +++ b/include/xmloff/xmlexp.hxx @@ -263,9 +263,9 @@ protected: public: SvXMLExport( - sal_Int16 const eDefaultMeasureUnit /*css::util::MeasureUnit*/, const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, + sal_Int16 const eDefaultMeasureUnit /*css::util::MeasureUnit*/, const enum ::xmloff::token::XMLTokenEnum eClass, SvXMLExportFlags nExportFlag ); diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 0151bad80865..bd93ff3a54e7 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -197,7 +197,7 @@ static void lcl_adjustColumnSpanOverRows(ORptExport::TSectionsGrid& _rGrid) } ORptExport::ORptExport(const Reference< XComponentContext >& _rxContext, OUString const & implementationName, SvXMLExportFlags nExportFlag) -: SvXMLExport( util::MeasureUnit::MM_100TH, _rxContext, implementationName, XML_REPORT, SvXMLExportFlags::OASIS) +: SvXMLExport( _rxContext, implementationName, util::MeasureUnit::MM_100TH, XML_REPORT, SvXMLExportFlags::OASIS) ,m_bAllreadyFilled(false) { setExportFlags( SvXMLExportFlags::OASIS | nExportFlag); diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index d2461326f36b..eca716116c69 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -341,8 +341,8 @@ static const OUStringLiteral gsLayerID( SC_LAYERID ); ScXMLExport::ScXMLExport( const css::uno::Reference< css::uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLExportFlags nExportFlag) -: SvXMLExport( GetMeasureUnit(), - rContext, implementationName, XML_SPREADSHEET, nExportFlag ), +: SvXMLExport( + rContext, implementationName, GetMeasureUnit(), XML_SPREADSHEET, nExportFlag ), pDoc(nullptr), nSourceStreamPos(0), aTableStyles(), diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx index c619f22f4dc1..2f7f8de552ff 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/source/mathmlexport.cxx @@ -337,7 +337,7 @@ bool SmXMLExportWrapper::WriteThroughComponent( SmXMLExport::SmXMLExport( const css::uno::Reference< css::uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLExportFlags nExportFlags) - : SvXMLExport(util::MeasureUnit::INCH, rContext, implementationName, XML_MATH, + : SvXMLExport(rContext, implementationName, util::MeasureUnit::INCH, XML_MATH, nExportFlags) , pTree(nullptr) , bSuccess(false) diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index f1e6509798c4..f49eb50d8a00 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -80,7 +80,7 @@ using namespace ::xmloff::token; SwXMLExport::SwXMLExport( const uno::Reference< uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLExportFlags nExportFlags) -: SvXMLExport( util::MeasureUnit::INCH, rContext, implementationName, XML_TEXT, +: SvXMLExport( rContext, implementationName, util::MeasureUnit::INCH, XML_TEXT, nExportFlags ), m_bBlock( false ), m_bShowProgress( true ), diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index b38f4df2b84c..7ea5e86a2b13 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -3576,7 +3576,7 @@ void SchXMLExportHelper_Impl::exportText( const OUString& rText ) SchXMLExport::SchXMLExport(const Reference<uno::XComponentContext>& xContext, OUString const& implementationName, SvXMLExportFlags nExportFlags) - : SvXMLExport(util::MeasureUnit::CM, xContext, implementationName, ::xmloff::token::XML_CHART, + : SvXMLExport(xContext, implementationName, util::MeasureUnit::CM, ::xmloff::token::XML_CHART, nExportFlags) , maAutoStylePool(new SchXMLAutoStylePoolP(*this)) , maExportHelper(new SchXMLExportHelper(*this, *maAutoStylePool)) diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 71a36957f9a5..59a3c9a00a35 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -422,9 +422,9 @@ void SvXMLExport::DetermineModelType_() } SvXMLExport::SvXMLExport( - sal_Int16 const eDefaultMeasureUnit /*css::util::MeasureUnit*/, const uno::Reference< uno::XComponentContext >& xContext, OUString const & implementationName, + sal_Int16 const eDefaultMeasureUnit /*css::util::MeasureUnit*/, const enum XMLTokenEnum eClass, SvXMLExportFlags nExportFlags ) : mpImpl( new SvXMLExport_Impl ), m_xContext(xContext), m_implementationName(implementationName), diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index cbeb6a6b4096..7d4db95dcdda 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -375,7 +375,7 @@ SdXMLExport::SdXMLExport( const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, bool bIsDraw, SvXMLExportFlags nExportFlags ) -: SvXMLExport( util::MeasureUnit::CM, xContext, implementationName, +: SvXMLExport( xContext, implementationName, util::MeasureUnit::CM, bIsDraw ? XML_GRAPHICS : XML_PRESENTATION, nExportFlags ), mnDocMasterPageCount(0), mnDocDrawPageCount(0), diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx index 218918183511..64080f879105 100644 --- a/xmloff/source/meta/MetaExportComponent.cxx +++ b/xmloff/source/meta/MetaExportComponent.cxx @@ -46,7 +46,7 @@ using namespace ::xmloff::token; XMLMetaExportComponent::XMLMetaExportComponent( const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, SvXMLExportFlags nFlags ) -: SvXMLExport( util::MeasureUnit::CM, xContext, implementationName, XML_TEXT, nFlags ) +: SvXMLExport( xContext, implementationName, util::MeasureUnit::CM, XML_TEXT, nFlags ) { } diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx index 5afa1f19ef61..b96fdb7ff0e6 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.cxx +++ b/xmloff/source/text/XMLAutoTextEventExport.cxx @@ -56,7 +56,7 @@ XMLAutoTextEventExport::XMLAutoTextEventExport( const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, SvXMLExportFlags nFlags ) -: SvXMLExport(util::MeasureUnit::INCH, xContext, implementationName, XML_AUTO_TEXT, nFlags) +: SvXMLExport(xContext, implementationName, util::MeasureUnit::INCH, XML_AUTO_TEXT, nFlags) { } |