diff options
| author | Noel Grandin <noel@peralex.com> | 2013-02-04 13:20:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-02-12 10:14:43 +0200 |
| commit | a6a8a8707b6ae111f94bac094d3c2909f523ca6f (patch) | |
| tree | 402b668480b3106df0d3055cff037c8a768a419c /svx | |
| parent | f1204419af34b1d2f0ecaa69ceeb1f8c8a7d87df (diff) | |
fdo#46808, convert xmloff module code to use XComponentContext
with lots of repurcussions in other modules
Change-Id: I6982671eecc701b06cf85d93533e1fe618044fea
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/inc/xmlxtimp.hxx | 2 | ||||
| -rw-r--r-- | svx/source/xml/xmlxtimp.cxx | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/svx/source/inc/xmlxtimp.hxx b/svx/source/inc/xmlxtimp.hxx index f6a739a95c24..ab055910ae2a 100644 --- a/svx/source/inc/xmlxtimp.hxx +++ b/svx/source/inc/xmlxtimp.hxx @@ -36,7 +36,7 @@ class SvxXMLXTableImport : public SvXMLImport public: // #110680# SvxXMLXTableImport( - 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 ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > & rTable, com::sun::star::uno::Reference< com::sun::star::document::XGraphicObjectResolver >& xGrfResolver); diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index ae81d1541ae5..c7f638352685 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -328,10 +328,10 @@ void SvxXMLTableImportContext::importBitmap( sal_uInt16 nPrfx, const OUString& r // #110680# SvxXMLXTableImport::SvxXMLXTableImport( - 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 uno::Reference< XNameContainer > & rTable, uno::Reference< XGraphicObjectResolver >& xGrfResolver ) -: SvXMLImport(xServiceFactory, 0), +: SvXMLImport(xContext, 0), mrTable( rTable ) { SetGraphicResolver( xGrfResolver ); @@ -383,13 +383,7 @@ bool SvxXMLXTableImport::load( const rtl::OUString &rPath, try { - uno::Reference<lang::XMultiServiceFactory> xServiceFactory( ::comphelper::getProcessServiceFactory() ); uno::Reference<uno::XComponentContext> xContext( ::comphelper::getProcessComponentContext() ); - if( !xServiceFactory.is() ) - { - OSL_FAIL( "SvxXMLXTableImport::load: got no service manager" ); - return false; - } uno::Reference< xml::sax::XParser > xParser = xml::sax::Parser::create( xContext ); @@ -448,7 +442,7 @@ bool SvxXMLXTableImport::load( const rtl::OUString &rPath, { } - uno::Reference< XDocumentHandler > xHandler( new SvxXMLXTableImport( xServiceFactory, xTable, xGrfResolver ) ); + uno::Reference< XDocumentHandler > xHandler( new SvxXMLXTableImport( xContext, xTable, xGrfResolver ) ); xParser->setDocumentHandler( xHandler ); xParser->parseStream( aParserInput ); |