diff options
| author | Noel Grandin <noel@peralex.com> | 2013-06-05 11:46:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-06-05 14:48:20 +0200 |
| commit | 73e686725e734c2bb576aefa2bb514d7b5f9a13c (patch) | |
| tree | 6dc5b852b494fde55028df60222856fb6368b67a /lotuswordpro | |
| parent | 4bd502a583912c63c4d35c1d5a2e7195e70cdbb9 (diff) | |
fdo#46808, Convert some more XMultiServiceFactory
Change-Id: Ib96976e0a40c025d1b6408aeadfc70d7885c11d4
Diffstat (limited to 'lotuswordpro')
| -rw-r--r-- | lotuswordpro/source/filter/LotusWordProImportFilter.cxx | 6 | ||||
| -rw-r--r-- | lotuswordpro/source/filter/LotusWordProImportFilter.hxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx index d31814e5e69d..837ae82a5682 100644 --- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx +++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx @@ -255,7 +255,7 @@ sal_Bool SAL_CALL LotusWordProImportFilter::importImpl( const Sequence< ::com::s // An XML import service: what we push sax messages to.. OUString sXMLImportService ( "com.sun.star.comp.Writer.XMLImporter" ); - uno::Reference< XDocumentHandler > xInternalHandler( mxMSF->createInstance( sXMLImportService ), UNO_QUERY ); + uno::Reference< XDocumentHandler > xInternalHandler( mxContext->getServiceManager()->createInstanceWithContext( sXMLImportService, mxContext ), UNO_QUERY ); uno::Reference < XImporter > xImporter(xInternalHandler, UNO_QUERY); if (xImporter.is()) xImporter->setTargetDocument(mxDoc); @@ -307,7 +307,7 @@ OUString SAL_CALL LotusWordProImportFilter::detect( com::sun::star::uno::Sequenc { try { - ::ucbhelper::Content aContent(sURL, xEnv, comphelper::getComponentContext(mxMSF)); + ::ucbhelper::Content aContent(sURL, xEnv, mxContext); xInputStream = aContent.openStream(); } catch ( Exception& ) @@ -377,7 +377,7 @@ Sequence< OUString > SAL_CALL LotusWordProImportFilter_getSupportedServiceNames( uno::Reference< XInterface > SAL_CALL LotusWordProImportFilter_createInstance( const uno::Reference< XMultiServiceFactory > & rSMgr) throw( Exception ) { - return (cppu::OWeakObject*) new LotusWordProImportFilter( rSMgr ); + return (cppu::OWeakObject*) new LotusWordProImportFilter( comphelper::getComponentContext(rSMgr) ); } // XServiceInfo diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx index 5fbee422d887..f2c7a5544fc0 100644 --- a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx +++ b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx @@ -50,7 +50,7 @@ private: protected: // oo.org declares - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxDoc; OUString msFilterName; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > mxHandler; @@ -61,8 +61,8 @@ protected: throw (::com::sun::star::uno::RuntimeException); public: - LotusWordProImportFilter( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > &rxMSF) - : mxMSF( rxMSF ) {} + LotusWordProImportFilter( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext) + : mxContext( rxContext ) {} virtual ~LotusWordProImportFilter() {} // XFilter |