fdo#46808, Convert XMultiServiceFactory in filter module

Change-Id: I9dcddba4f5a8a7adeddc31b5df014b0174b9745d

2 files changed, 13 insertions, 26 deletions

diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index c0b017cfc489..19dfbb1f620b 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -85,7 +85,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star
     }
 
     OUString sXMLImportService (  udImport  );
-    Reference < XParser > xSaxParser = Parser::create( comphelper::getComponentContext(mxMSF) );
+    Reference < XParser > xSaxParser = Parser::create( mxContext );
 
     Sequence< Any > aAnys(1);
     OUString aBaseURI;
@@ -111,7 +111,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star
     aAnys[0] <<= xInfoSet;
 
 
-    Reference < XDocumentHandler > xHandler( mxMSF->createInstanceWithArguments( sXMLImportService, aAnys ), UNO_QUERY );
+    Reference < XDocumentHandler > xHandler( mxContext->getServiceManager()->createInstanceWithArgumentsAndContext( sXMLImportService, aAnys, mxContext ), UNO_QUERY );
     if(! xHandler.is()) {
         OSL_FAIL("XMLReader::Read: %s Unable to create service instance xHandler\n" );
         return sal_False;
@@ -126,7 +126,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star
     //*********************
     // Creating a ConverterBridge instance
     //*********************
-    Reference< XInterface > xConvBridge(mxMSF->createInstance( udConvertClass ), UNO_QUERY);
+    Reference< XInterface > xConvBridge(mxContext->getServiceManager()->createInstanceWithContext(udConvertClass, mxContext), UNO_QUERY);
     if(! xConvBridge.is()){
         OSL_FAIL( "XMLReader::Read: %s service missing\n" );
         return sal_False;
@@ -160,8 +160,8 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star
             //Load the Styles from the Template URL Supplied in the TypeDetection file
             if(msTemplateName.indexOf(OUString( "file:" ))==-1)
             {
-                Reference< XConfigManager >xCfgMgr ( mxMSF->createInstance(
-                    OUString( "com.sun.star.config.SpecialConfigManager" ) ), UNO_QUERY );
+                Reference< XConfigManager >xCfgMgr ( mxContext->getServiceManager()->createInstanceWithContext(
+                    "com.sun.star.config.SpecialConfigManager", mxContext ), UNO_QUERY );
                 OUString PathString(xCfgMgr->substituteVariables(OUString("$(progurl)")));
                 PathString = PathString.concat(OUString( "/" ));
                 msTemplateName=PathString.concat(msTemplateName);
@@ -223,7 +223,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star
        xStatusIndicator->start(OUString( "Saving :" ),nProgressRange);
 
     // Set up converter bridge.
-    Reference< com::sun::star::xml::XExportFilter > xConverter(mxMSF->createInstance(udConvertClass ), UNO_QUERY);
+    Reference< com::sun::star::xml::XExportFilter > xConverter(mxContext->getServiceManager()->createInstanceWithContext( udConvertClass, mxContext ), UNO_QUERY);
     if(! xConverter.is()){
       OSL_FAIL( "xml export sub service missing" );
       return sal_False;
@@ -288,8 +288,8 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star
             OUString( "BaseURI" ), makeAny( aBaseURI ));
         aAnys[1] <<= xInfoSet;
 
-        Reference< XExporter > xExporter( mxMSF->createInstanceWithArguments (
-                       udExport, aAnys ), UNO_QUERY_THROW );
+        Reference< XExporter > xExporter( mxContext->getServiceManager()->createInstanceWithArgumentsAndContext(
+                       udExport, aAnys, mxContext ), UNO_QUERY_THROW );
 
         // attach to source document
         xExporter->setSourceDocument( mxDoc );
@@ -398,7 +398,7 @@ Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames(  )
 Reference< XInterface > SAL_CALL XmlFilterAdaptor_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
     throw( Exception )
 {
-    return (cppu::OWeakObject*) new XmlFilterAdaptor( rSMgr );
+    return (cppu::OWeakObject*) new XmlFilterAdaptor( comphelper::getComponentContext(rSMgr) );
 }
 
 // XServiceInfo
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
index 68df79320d91..4ffaf0f79b99 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/document/XImporter.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/implbase5.hxx>
 
 
@@ -41,26 +42,18 @@ enum FilterType
  * member calls */
 
 class XmlFilterAdaptor : public cppu::WeakImplHelper5
-
 <
-
     com::sun::star::document::XFilter,
-
     com::sun::star::document::XExporter,
-
     com::sun::star::document::XImporter,
-
     com::sun::star::lang::XInitialization,
-
     com::sun::star::lang::XServiceInfo
-
 >
-
 {
 
 protected:
 
-  ::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;
 
@@ -73,20 +66,17 @@ protected:
     FilterType meType;
 
     sal_Bool SAL_CALL exportImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
-
         throw (::com::sun::star::uno::RuntimeException);
 
     sal_Bool SAL_CALL importImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
-
         throw (::com::sun::star::uno::RuntimeException);
 
 
 
 public:
 
-    XmlFilterAdaptor( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > &rxMSF)
-
-        : mxMSF( rxMSF ) {}
+    XmlFilterAdaptor( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext)
+        : mxContext( rxContext ) {}
 
     virtual ~XmlFilterAdaptor() {}
 
@@ -95,11 +85,9 @@ public:
     // XFilter
 
     virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
-
         throw (::com::sun::star::uno::RuntimeException);
 
     virtual void SAL_CALL cancel(  )
-
         throw (::com::sun::star::uno::RuntimeException);
 
 
@@ -107,7 +95,6 @@ public:
     // XExporter
 
     virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc )
-
         throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);