diff options
| author | Noel Grandin <noel@peralex.com> | 2013-01-16 17:12:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-02-11 08:02:11 +0200 |
| commit | e5fdaec54a54e42b487c37e6b01493bcdfc30b4c (patch) | |
| tree | 26421d24cee78af24feb748fc52845f279dd299e /svx | |
| parent | c4d051c5dbee532264e1bfc2ccdb337c6dcf83ed (diff) | |
fdo#46808, Adapt document::XML*BasicExporter UNO services to new style
The services are
document::XMLBasicExporter
document::XMLOasisBasicExporter
Change-Id: Ifd93e5735cae94d34904d79769cdb3edf587fe43
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/inc/xmlxtexp.hxx | 2 | ||||
| -rw-r--r-- | svx/source/xml/xmlxtexp.cxx | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/svx/source/inc/xmlxtexp.hxx b/svx/source/inc/xmlxtexp.hxx index 4ec56a7ccb9c..04a17e2ecd90 100644 --- a/svx/source/inc/xmlxtexp.hxx +++ b/svx/source/inc/xmlxtexp.hxx @@ -37,7 +37,7 @@ class SvxXMLXTableExportComponent : public SvXMLExport public: // #110680# SvxXMLXTableExportComponent( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, const rtl::OUString& rFileName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > & xHandler, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > & xTable, diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index 3786c4d5c9a4..36de147adf29 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -146,12 +146,12 @@ private: // #110680# SvxXMLXTableExportComponent::SvxXMLXTableExportComponent( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, const OUString& rFileName, const uno::Reference<xml::sax::XDocumentHandler> & rHandler, const uno::Reference<container::XNameContainer >& xTable, uno::Reference<document::XGraphicObjectResolver >& xGrfResolver ) -: SvXMLExport( xServiceFactory, rFileName, rHandler, NULL, MAP_100TH_MM), +: SvXMLExport( xContext, rFileName, rHandler, NULL, MAP_100TH_MM), mxTable( xTable ) { @@ -227,13 +227,7 @@ bool SvxXMLXTableExportComponent::save( try { - uno::Reference< lang::XMultiServiceFactory> xServiceFactory( ::comphelper::getProcessServiceFactory() ); uno::Reference< uno::XComponentContext> xContext( ::comphelper::getProcessComponentContext() ); - if( !xServiceFactory.is() ) - { - OSL_FAIL( "got no service manager" ); - return false; - } uno::Reference< xml::sax::XWriter > xWriter = xml::sax::Writer::create( xContext ); @@ -306,7 +300,7 @@ bool SvxXMLXTableExportComponent::save( // Finally do the export const OUString aName; - SvxXMLXTableExportComponent aExporter( xServiceFactory, aName, xHandler, xTable, xGrfResolver ); + SvxXMLXTableExportComponent aExporter( xContext, aName, xHandler, xTable, xGrfResolver ); bRet = aExporter.exportTable(); if( pGraphicHelper ) |