fdo#46808, Convert XMultiServiceFactory in filter module

Change-Id: I9dcddba4f5a8a7adeddc31b5df014b0174b9745d

13 files changed, 66 insertions, 70 deletions

diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx
index 12cc401854b3..e8be7db4414b 100644
--- a/filter/source/xsltdialog/typedetectionimport.cxx
+++ b/filter/source/xsltdialog/typedetectionimport.cxx
@@ -35,9 +35,8 @@ using namespace com::sun::star;
 using namespace std;
 
 
-TypeDetectionImporter::TypeDetectionImporter( Reference< XMultiServiceFactory >& xMSF )
-:   mxMSF(xMSF),
-    sRootNode( "oor:component-data" ),
+TypeDetectionImporter::TypeDetectionImporter()
+:   sRootNode( "oor:component-data" ),
     sNode( "node" ),
     sName( "oor:name" ),
     sProp( "prop" ),
@@ -57,13 +56,13 @@ TypeDetectionImporter::~TypeDetectionImporter (void )
 {
 }
 
-void TypeDetectionImporter::doImport( Reference< XMultiServiceFactory >& xMSF, Reference< XInputStream > xIS, XMLFilterVector& rFilters )
+void TypeDetectionImporter::doImport( const Reference< XComponentContext >& rxContext, Reference< XInputStream > xIS, XMLFilterVector& rFilters )
 {
     try
     {
-        Reference< XParser > xParser = xml::sax::Parser::create( comphelper::getComponentContext(xMSF) );
+        Reference< XParser > xParser = xml::sax::Parser::create( rxContext );
 
-        TypeDetectionImporter* pImporter = new TypeDetectionImporter( xMSF );
+        TypeDetectionImporter* pImporter = new TypeDetectionImporter;
         Reference < XDocumentHandler > xDocHandler( pImporter );
         xParser->setDocumentHandler( xDocHandler );
 
diff --git a/filter/source/xsltdialog/typedetectionimport.hxx b/filter/source/xsltdialog/typedetectionimport.hxx
index 73d1077946e2..8e1f0296dd7e 100644
--- a/filter/source/xsltdialog/typedetectionimport.hxx
+++ b/filter/source/xsltdialog/typedetectionimport.hxx
@@ -61,10 +61,10 @@ typedef std::vector< Node* > NodeVector;
 class TypeDetectionImporter : public cppu::WeakImplHelper1 < com::sun::star::xml::sax::XDocumentHandler >
 {
 public:
-    TypeDetectionImporter( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xMSF );
+    TypeDetectionImporter();
     virtual ~TypeDetectionImporter( void );
 
-    static void doImport( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xMSF, com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xOS, XMLFilterVector& rFilters );
+    static void doImport( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xOS, XMLFilterVector& rFilters );
 
     virtual void SAL_CALL startDocument(  )
         throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
@@ -88,8 +88,6 @@ private:
     filter_info_impl* createFilterForNode( Node * pNode );
     Node* findTypeNode( const OUString& rType );
 
-    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > mxMSF;
-
     std::stack< ImportState > maStack;
     PropertyMap maPropertyMap;
 
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index 7c692405ce37..6aa7ace9f884 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -67,7 +67,7 @@ class XMLFilterDialogComponent :    public XMLFilterDialogComponentBase,
                                     public XTerminateListener
 {
 public:
-    XMLFilterDialogComponent( const Reference< XMultiServiceFactory >& rxMSF );
+    XMLFilterDialogComponent( const Reference< XComponentContext >& rxContext );
     virtual ~XMLFilterDialogComponent();
 
 protected:
@@ -104,7 +104,7 @@ protected:
 
 private:
     com::sun::star::uno::Reference<com::sun::star::awt::XWindow> mxParent;  /// parent window
-    com::sun::star::uno::Reference< XMultiServiceFactory > mxMSF;
+    com::sun::star::uno::Reference< XComponentContext > mxContext;
 
     XMLFilterSettingsDialog* mpDialog;
 };
@@ -121,12 +121,12 @@ ResMgr* getXSLTDialogResMgr()
     return pXSLTResMgr;
 }
 
-XMLFilterDialogComponent::XMLFilterDialogComponent( const com::sun::star::uno::Reference< XMultiServiceFactory >& rxMSF ) :
+XMLFilterDialogComponent::XMLFilterDialogComponent( const com::sun::star::uno::Reference< XComponentContext >& rxContext ) :
     OComponentHelper( maMutex ),
-    mxMSF( rxMSF ),
+    mxContext( rxContext ),
     mpDialog( NULL )
 {
-    Reference< XDesktop2 > xDesktop = Desktop::create( comphelper::getComponentContext(mxMSF) );
+    Reference< XDesktop2 > xDesktop = Desktop::create( rxContext );
     Reference< XTerminateListener > xListener( this );
     xDesktop->addTerminateListener( xListener );
 }
@@ -218,7 +218,7 @@ sal_Bool SAL_CALL XMLFilterDialogComponent_supportsService( const OUString& Serv
 
 Reference< XInterface > SAL_CALL XMLFilterDialogComponent_createInstance( const Reference< XMultiServiceFactory > & rSMgr) throw ( Exception )
 {
-    return (OWeakObject*)new XMLFilterDialogComponent( rSMgr );
+    return (OWeakObject*)new XMLFilterDialogComponent( comphelper::getComponentContext(rSMgr) );
 }
 
 //-------------------------------------------------------------------------
@@ -359,7 +359,7 @@ sal_Int16 SAL_CALL XMLFilterDialogComponent::execute(  ) throw(RuntimeException)
             pParent = VCLUnoHelper::GetWindow(mxParent);
 
         Reference< XComponent > xComp( this );
-        mpDialog = new XMLFilterSettingsDialog(pParent, mxMSF);
+        mpDialog = new XMLFilterSettingsDialog(pParent, mxContext);
         mpDialog->Execute();
     }
     else if( !mpDialog->IsVisible() )
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index 12241c771286..a0c6159d09de 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -60,8 +60,8 @@ using namespace com::sun::star::io;
 
 using ::rtl::Uri;
 
-XMLFilterJarHelper::XMLFilterJarHelper( Reference< XMultiServiceFactory >& xMSF )
-: mxMSF( xMSF ),
+XMLFilterJarHelper::XMLFilterJarHelper( const Reference< XComponentContext >& rxContext )
+: mxContext( rxContext ),
     sVndSunStarPackage( "vnd.sun.star.Package:" ),
     sXSLTPath( "$(user)/xslt/" ),
     sTemplatePath( "$(user)/template/" ),
@@ -71,7 +71,7 @@ XMLFilterJarHelper::XMLFilterJarHelper( Reference< XMultiServiceFactory >& xMSF
 {
     try
     {
-        Reference< XConfigManager > xCfgMgr( xMSF->createInstance(OUString( "com.sun.star.config.SpecialConfigManager" )), UNO_QUERY );
+        Reference< XConfigManager > xCfgMgr( rxContext->getServiceManager()->createInstanceWithContext( "com.sun.star.config.SpecialConfigManager", rxContext ), UNO_QUERY );
         if( xCfgMgr.is() )
         {
             sProgPath = xCfgMgr->substituteVariables( sProgPath );
@@ -166,9 +166,9 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt
         aArguments[ 1 ] <<= aArg;
 
         Reference< XHierarchicalNameAccess > xIfc(
-            mxMSF->createInstanceWithArguments(
-                OUString( "com.sun.star.packages.comp.ZipPackage" ),
-                aArguments ), UNO_QUERY );
+            mxContext->getServiceManager()->createInstanceWithArgumentsAndContext(
+                "com.sun.star.packages.comp.ZipPackage",
+                aArguments, mxContext ), UNO_QUERY );
 
         if( xIfc.is() )
         {
@@ -220,8 +220,7 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt
                 /* osl::File::RC rc = */ aOutputFile.open( osl_File_OpenFlag_Write );
                 Reference< XOutputStream > xOS( new OSLOutputStreamWrapper( aOutputFile ) );
 
-                Reference<XComponentContext> xContext( comphelper::getComponentContext(mxMSF) );
-                TypeDetectionExporter aExporter( xContext );
+                TypeDetectionExporter aExporter( mxContext );
                 aExporter.doExport(xOS,rFilters);
             }
 
@@ -266,9 +265,9 @@ void XMLFilterJarHelper::openPackage( const OUString& rPackageURL, XMLFilterVect
         aArguments[ 1 ] <<= aArg;
 
         Reference< XHierarchicalNameAccess > xIfc(
-            mxMSF->createInstanceWithArguments(
-                OUString( "com.sun.star.packages.comp.ZipPackage" ),
-                aArguments ), UNO_QUERY );
+            mxContext->getServiceManager()->createInstanceWithArgumentsAndContext(
+                "com.sun.star.packages.comp.ZipPackage",
+                aArguments, mxContext ), UNO_QUERY );
 
         if( xIfc.is() )
         {
@@ -290,7 +289,7 @@ void XMLFilterJarHelper::openPackage( const OUString& rPackageURL, XMLFilterVect
                     Reference< XInputStream > xIS( xTypeDetection->getInputStream() );
 
                     XMLFilterVector aFilters;
-                    TypeDetectionImporter::doImport( mxMSF, xIS, aFilters );
+                    TypeDetectionImporter::doImport( mxContext, xIS, aFilters );
 
                     // copy all files used by the filters imported from the
                     // typedetection to office/user/xslt
diff --git a/filter/source/xsltdialog/xmlfilterjar.hxx b/filter/source/xsltdialog/xmlfilterjar.hxx
index 8aea9d5c7cbd..6681e186684a 100644
--- a/filter/source/xsltdialog/xmlfilterjar.hxx
+++ b/filter/source/xsltdialog/xmlfilterjar.hxx
@@ -32,7 +32,7 @@ typedef std::vector< filter_info_impl* > XMLFilterVector;
 class XMLFilterJarHelper
 {
 public:
-    XMLFilterJarHelper( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xMSF );
+    XMLFilterJarHelper( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext );
 
     bool savePackage( const OUString& rPackageURL, const XMLFilterVector& rFilters );
     void openPackage( const OUString& rPackageURL, XMLFilterVector& rFilters );
@@ -43,7 +43,7 @@ private:
     bool copyFile( com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > xIfc, OUString& rURL, const OUString& rTargetURL );
     bool copyFiles( com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > xIfc, filter_info_impl* pFilter );
 
-    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > mxMSF;
+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
 
     OUString sVndSunStarPackage;
     OUString sXSLTPath;
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 6356298cf881..cad9278be875 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -55,9 +55,9 @@ using namespace com::sun::star::util;
 using ::rtl::Uri;
 
 XMLFilterSettingsDialog::XMLFilterSettingsDialog(Window* pParent,
-    const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxMSF)
+    const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext)
     : ModelessDialog(pParent, "XMLFilterSettingsDialog", "filter/ui/xmlfiltersettings.ui")
-    , mxMSF( rxMSF )
+    , mxContext( rxContext )
     , m_bIsClosable(true)
     , m_sTemplatePath("$(user)/template/")
     , m_sDocTypePrefix("doctype:")
@@ -89,11 +89,11 @@ XMLFilterSettingsDialog::XMLFilterSettingsDialog(Window* pParent,
 
     try
     {
-        mxFilterContainer = Reference< XNameContainer >::query( rxMSF->createInstance( "com.sun.star.document.FilterFactory" ) );
-        mxTypeDetection = Reference< XNameContainer >::query( rxMSF->createInstance( "com.sun.star.document.TypeDetection" ) );
-        mxExtendedTypeDetection = Reference< XNameContainer >::query( rxMSF->createInstance( "com.sun.star.document.ExtendedTypeDetectionFactory" ) );
+        mxFilterContainer = Reference< XNameContainer >::query( rxContext->getServiceManager()->createInstanceWithContext( "com.sun.star.document.FilterFactory", rxContext ) );
+        mxTypeDetection = Reference< XNameContainer >::query( rxContext->getServiceManager()->createInstanceWithContext( "com.sun.star.document.TypeDetection", rxContext ) );
+        mxExtendedTypeDetection = Reference< XNameContainer >::query( rxContext->getServiceManager()->createInstanceWithContext( "com.sun.star.document.ExtendedTypeDetectionFactory", rxContext ) );
 
-        Reference< XConfigManager > xCfgMgr( mxMSF->createInstance( "com.sun.star.config.SpecialConfigManager" ), UNO_QUERY );
+        Reference< XConfigManager > xCfgMgr( rxContext->getServiceManager()->createInstanceWithContext( "com.sun.star.config.SpecialConfigManager", rxContext ), UNO_QUERY );
         if( xCfgMgr.is() )
         {
             m_sTemplatePath = xCfgMgr->substituteVariables( m_sTemplatePath );
@@ -233,7 +233,7 @@ void XMLFilterSettingsDialog::onNew()
     aTempInfo.maDocumentService = "com.sun.star.text.TextDocument";
 
     // execute XML Filter Dialog
-    XMLFilterTabDialog aDlg( this, *getXSLTDialogResMgr(), mxMSF, &aTempInfo );
+    XMLFilterTabDialog aDlg( this, *getXSLTDialogResMgr(), mxContext, &aTempInfo );
     if ( aDlg.Execute() == RET_OK )
     {
         // insert the new filter
@@ -254,7 +254,7 @@ void XMLFilterSettingsDialog::onEdit()
         filter_info_impl* pOldInfo = (filter_info_impl*)pEntry->GetUserData();
 
         // execute XML Filter Dialog
-        XMLFilterTabDialog aDlg( this, *getXSLTDialogResMgr(), mxMSF, pOldInfo );
+        XMLFilterTabDialog aDlg( this, *getXSLTDialogResMgr(), mxContext, pOldInfo );
         if ( aDlg.Execute() == RET_OK )
         {
             filter_info_impl* pNewInfo = aDlg.getNewFilterInfo();
@@ -781,7 +781,7 @@ void XMLFilterSettingsDialog::onTest()
     {
         filter_info_impl* pInfo = (filter_info_impl*)pEntry->GetUserData();
 
-        XMLFilterTestDialog aDlg(this, mxMSF);
+        XMLFilterTestDialog aDlg(this, mxContext);
         aDlg.test( *pInfo );
     }
 }
@@ -910,7 +910,7 @@ void XMLFilterSettingsDialog::onSave()
 
     if ( aDlg.Execute() == ERRCODE_NONE )
     {
-        XMLFilterJarHelper aJarHelper( mxMSF );
+        XMLFilterJarHelper aJarHelper( mxContext );
         aJarHelper.savePackage( aDlg.GetPath(), aFilters );
 
         INetURLObject aURL( aDlg.GetPath() );
@@ -958,7 +958,7 @@ void XMLFilterSettingsDialog::onOpen()
     {
         OUString aURL( aDlg.GetPath() );
 
-        XMLFilterJarHelper aJarHelper( mxMSF );
+        XMLFilterJarHelper aJarHelper( mxContext );
         aJarHelper.openPackage( aURL, aFilters );
 
         int nFilters = 0;
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
index 80176e02128c..bf3b1c457afb 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
@@ -86,7 +86,7 @@ class XMLFilterSettingsDialog : public ModelessDialog
 {
 public:
     XMLFilterSettingsDialog(Window* pParent,
-        const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxMSF);
+        const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext);
 
     DECL_LINK(ClickHdl_Impl, PushButton * );
     DECL_LINK(SelectionChangedHdl_Impl, void * );
@@ -120,7 +120,7 @@ private:
 
 private:
 
-    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::container::XNameContainer > mxFilterContainer;
     com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > mxTypeDetection;
     com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > mxExtendedTypeDetection;
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index 78a1505b9012..6ed8e501433e 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
@@ -38,9 +38,9 @@ using namespace com::sun::star::container;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::lang;
 
-XMLFilterTabDialog::XMLFilterTabDialog( Window *pParent, ResMgr& rResMgr, const Reference< XMultiServiceFactory >& rxMSF, const filter_info_impl* pInfo ) :
+XMLFilterTabDialog::XMLFilterTabDialog( Window *pParent, ResMgr& rResMgr, const Reference< XComponentContext >& rxContext, const filter_info_impl* pInfo ) :
     TabDialog( pParent, ResId( DLG_XML_FILTER_TABDIALOG, rResMgr ) ),
-    mxMSF( rxMSF ),
+    mxContext( rxContext ),
     mrResMgr( rResMgr ),
     maTabCtrl( this, ResId( 1, rResMgr ) ),
     maOKBtn( this ),
@@ -82,7 +82,7 @@ XMLFilterTabDialog::XMLFilterTabDialog( Window *pParent, ResMgr& rResMgr, const
         aCtrlSiz = aSiz;
     }
 
-    mpXSLTPage = new XMLFilterTabPageXSLT( &maTabCtrl, mrResMgr, mxMSF );
+    mpXSLTPage = new XMLFilterTabPageXSLT( &maTabCtrl, mrResMgr, mxContext );
     mpXSLTPage->SetInfo( mpNewInfo );
 
     maTabCtrl.SetTabPage( RID_XML_FILTER_TABPAGE_XSLT, mpXSLTPage );
@@ -133,7 +133,7 @@ bool XMLFilterTabDialog::onOk()
         {
             try
             {
-                Reference< XNameAccess > xFilterContainer( mxMSF->createInstance( "com.sun.star.document.FilterFactory" ), UNO_QUERY );
+                Reference< XNameAccess > xFilterContainer( mxContext->getServiceManager()->createInstanceWithContext( "com.sun.star.document.FilterFactory", mxContext ), UNO_QUERY );
                 if( xFilterContainer.is() )
                 {
                     if( xFilterContainer->hasByName( mpNewInfo->maFilterName ) )
@@ -165,7 +165,7 @@ bool XMLFilterTabDialog::onOk()
         {
             try
             {
-                Reference< XNameAccess > xFilterContainer( mxMSF->createInstance( "com.sun.star.document.FilterFactory" ), UNO_QUERY );
+                Reference< XNameAccess > xFilterContainer( mxContext->getServiceManager()->createInstanceWithContext( "com.sun.star.document.FilterFactory", mxContext ), UNO_QUERY );
                 if( xFilterContainer.is() )
                 {
                     Sequence< OUString > aFilterNames( xFilterContainer->getElementNames() );
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
index 2d0189278073..f7af2fc9dd3d 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
@@ -34,7 +34,7 @@ class XMLFilterTabPageXSLT;
 class XMLFilterTabDialog: public TabDialog
 {
 public:
-    XMLFilterTabDialog( Window *pParent, ResMgr& rResMgr, const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxMSF, const filter_info_impl* pInfo );
+    XMLFilterTabDialog( Window *pParent, ResMgr& rResMgr, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const filter_info_impl* pInfo );
     virtual ~XMLFilterTabDialog();
 
     ResMgr& getResMgr() { return mrResMgr; }
@@ -44,7 +44,7 @@ public:
     filter_info_impl* getNewFilterInfo() const;
 
 private:
-    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > mxMSF;
+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
 
     DECL_LINK( ActivatePageHdl, TabControl * );
     DECL_LINK( DeactivatePageHdl, TabControl * );
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
index bc6652db7b22..04bc14139ef2 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::lang;
 
-XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( Window* pParent, ResMgr& rResMgr, const css::uno::Reference< XMultiServiceFactory >& rxMSF ) :
+XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( Window* pParent, ResMgr& rResMgr, const css::uno::Reference< XComponentContext >& rxContext ) :
     TabPage( pParent, ResId( RID_XML_FILTER_TABPAGE_XSLT, rResMgr ) ),
 
     maFTDocType( this, ResId( FT_XML_DOCTYPE, rResMgr ) ),
@@ -66,7 +66,7 @@ XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( Window* pParent, ResMgr& rResMgr, co
 
     try
     {
-        css::uno::Reference< XConfigManager > xCfgMgr( rxMSF->createInstance( "com.sun.star.config.SpecialConfigManager" ), UNO_QUERY );
+        css::uno::Reference< XConfigManager > xCfgMgr( rxContext->getServiceManager()->createInstanceWithContext( "com.sun.star.config.SpecialConfigManager", rxContext ), UNO_QUERY );
         if( xCfgMgr.is() )
             sInstPath = xCfgMgr->substituteVariables( sInstPath );
     }
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
index 062637e1f02b..57e1b19028e3 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx
@@ -33,7 +33,7 @@ class filter_info_impl;
 class XMLFilterTabPageXSLT : public TabPage
 {
 public:
-    XMLFilterTabPageXSLT( Window* pParent, ResMgr& rResMgr, const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxMSF );
+    XMLFilterTabPageXSLT( Window* pParent, ResMgr& rResMgr, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext );
     virtual ~XMLFilterTabPageXSLT();
 
     bool FillInfo( filter_info_impl* pInfo );
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 807393253b0b..0490c3fded1b 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -134,9 +134,9 @@ static bool checkComponent( Reference< XComponent >& rxComponent, const OUString
 }
 
 XMLFilterTestDialog::XMLFilterTestDialog(Window* pParent,
-    const Reference<XMultiServiceFactory>& rxMSF)
+    const Reference<XComponentContext>& rxContext)
     : ModalDialog(pParent, "TestXMLFilterDialog", "filter/ui/testxmlfilter.ui")
-    , mxMSF(rxMSF)
+    , mxContext(rxContext)
     , m_pFilterInfo(NULL)
 {
     get(m_pExport, "export");
@@ -166,7 +166,7 @@ XMLFilterTestDialog::XMLFilterTestDialog(Window* pParent,
 
     try
     {
-        mxGlobalBroadcaster = Reference < XEventBroadcaster >( GlobalEventBroadcaster::create(comphelper::getComponentContext(mxMSF)), UNO_QUERY_THROW );
+        mxGlobalBroadcaster = GlobalEventBroadcaster::create(mxContext);
         mxGlobalEventListener = new GlobalEventListenerImpl( this );
         mxGlobalBroadcaster->addEventListener( mxGlobalEventListener );
     }
@@ -295,8 +295,8 @@ void XMLFilterTestDialog::onExportBrowse()
             com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
             0 );
 
-        Reference< XNameAccess > xFilterContainer( mxMSF->createInstance( OUString( "com.sun.star.document.FilterFactory" ) ), UNO_QUERY );
-        Reference< XNameAccess > xTypeDetection( mxMSF->createInstance( OUString( "com.sun.star.document.TypeDetection" ) ), UNO_QUERY );
+        Reference< XNameAccess > xFilterContainer( mxContext->getServiceManager()->createInstanceWithContext( "com.sun.star.document.FilterFactory", mxContext ), UNO_QUERY );
+        Reference< XNameAccess > xTypeDetection( mxContext->getServiceManager()->createInstanceWithContext( "com.sun.star.document.TypeDetection", mxContext ), UNO_QUERY );
         if( xFilterContainer.is() && xTypeDetection.is() )
         {
             Sequence< OUString > aFilterNames( xFilterContainer->getElementNames() );
@@ -400,8 +400,8 @@ void XMLFilterTestDialog::onExportBrowse()
         {
             m_sExportRecentFile = aDlg.GetPath();
 
-            Reference< XDesktop2 > xLoader = Desktop::create( comphelper::getComponentContext(mxMSF) );
-            Reference< XInteractionHandler2 > xInter( InteractionHandler::createWithParent(comphelper::getComponentContext(mxMSF), 0) );
+            Reference< XDesktop2 > xLoader = Desktop::create( mxContext );
+            Reference< XInteractionHandler2 > xInter = InteractionHandler::createWithParent(mxContext, 0);
             OUString aFrame( "_default" );
             Sequence< PropertyValue > aArguments(1);
             aArguments[0].Name = OUString( "InteractionHandler" );
@@ -463,7 +463,7 @@ void XMLFilterTestDialog::doExport( Reference< XComponent > xComp )
                         aSourceData[i++].Value <<= m_pFilterInfo->maDocType;
                     }
 
-                Reference< XExportFilter > xExporter( mxMSF->createInstance( OUString( "com.sun.star.documentconversion.XSLTFilter" ) ), UNO_QUERY );
+                Reference< XExportFilter > xExporter( mxContext->getServiceManager()->createInstanceWithContext( "com.sun.star.documentconversion.XSLTFilter", mxContext ), UNO_QUERY );
                 Reference< XDocumentHandler > xHandler( xExporter, UNO_QUERY );
                 if( xHandler.is() )
                 {
@@ -495,7 +495,7 @@ void XMLFilterTestDialog::doExport( Reference< XComponent > xComp )
     //              *pArgs++ <<= xInfoSet;
                     *pArgs   <<= xHandler;
 
-                    Reference< XFilter > xFilter( mxMSF->createInstanceWithArguments( pAppInfo->maXMLExporter, aArgs ), UNO_QUERY );
+                    Reference< XFilter > xFilter( mxContext->getServiceManager()->createInstanceWithArgumentsAndContext( pAppInfo->maXMLExporter, aArgs, mxContext ), UNO_QUERY );
                     if( xFilter.is() )
                     {
                         Reference< XExporter > xExporter2( xFilter, UNO_QUERY );
@@ -585,8 +585,8 @@ void XMLFilterTestDialog::import( const OUString& rURL )
 {
     try
     {
-        Reference< XDesktop2 > xLoader = Desktop::create( comphelper::getComponentContext(mxMSF) );
-        Reference< XInteractionHandler2 > xInter( InteractionHandler::createWithParent(comphelper::getComponentContext(mxMSF), 0) );
+        Reference< XDesktop2 > xLoader = Desktop::create( mxContext );
+        Reference< XInteractionHandler2 > xInter = InteractionHandler::createWithParent(mxContext, 0);
 
         OUString aFrame( "_default" );
         Sequence< PropertyValue > aArguments(2);
@@ -604,7 +604,7 @@ void XMLFilterTestDialog::import( const OUString& rURL )
             TempFile aTempFile(lead, &ext);
             OUString aTempFileURL( aTempFile.GetURL() );
 
-            Reference< XImportFilter > xImporter( mxMSF->createInstance( OUString( "com.sun.star.documentconversion.XSLTFilter" ) ), UNO_QUERY );
+            Reference< XImportFilter > xImporter( mxContext->getServiceManager()->createInstanceWithContext( "com.sun.star.documentconversion.XSLTFilter", mxContext ), UNO_QUERY );
             if( xImporter.is() )
             {
                 osl::File aInputFile( rURL );
@@ -624,7 +624,7 @@ void XMLFilterTestDialog::import( const OUString& rURL )
                 aSourceData[i  ].Name = OUString( "Indent" );
                 aSourceData[i++].Value <<= (sal_Bool)sal_True;
 
-                Reference< XWriter > xWriter = Writer::create( comphelper::getComponentContext(mxMSF) );
+                Reference< XWriter > xWriter = Writer::create( mxContext );
 
                 File aOutputFile( aTempFileURL );
                 aOutputFile.open( osl_File_OpenFlag_Write );
@@ -678,7 +678,7 @@ Reference< XComponent > XMLFilterTestDialog::getFrontMostDocument( const OUStrin
 
     try
     {
-        Reference< XDesktop2 > xDesktop = Desktop::create( comphelper::getComponentContext(mxMSF) );
+        Reference< XDesktop2 > xDesktop = Desktop::create( mxContext );
         Reference< XComponent > xTest( mxLastFocusModel );
         if( checkComponent( xTest, rServiceName ) )
         {
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
index 51732137cda0..fd1b2b9e7905 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
@@ -35,7 +35,7 @@ class XMLFilterTestDialog : public ModalDialog
 {
 public:
     XMLFilterTestDialog(Window* pParent,
-        const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxMSF);
+        const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext);
     virtual ~XMLFilterTestDialog();
 
     void test( const filter_info_impl& rFilterInfo );
@@ -57,7 +57,7 @@ private:
     void doExport( com::sun::star::uno::Reference< com::sun::star::lang::XComponent > xComp );
 
 private:
-    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::document::XEventBroadcaster > mxGlobalBroadcaster;
     com::sun::star::uno::Reference< com::sun::star::document::XEventListener > mxGlobalEventListener;
     com::sun::star::uno::WeakReference< com::sun::star::lang::XComponent > mxLastFocusModel;