fdo#46808, Convert a bunch of comphelper::ComponentContext stuff

.. to Reference<XComponentContext>
mostly in the dbaccess module, but it also affected some other
modules.

Change-Id: I09b3f6fe7a9b33498b11d98b5521b5aeeb8882be

6 files changed, 15 insertions, 13 deletions

diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx
index ba3a51ed8adc..83c8f6f0fa6c 100644
--- a/filter/source/flash/swfdialog.cxx
+++ b/filter/source/flash/swfdialog.cxx
@@ -23,6 +23,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/dialog.hxx>
 #include <svl/solar.hrc>
+#include <comphelper/processfactory.hxx>
 #include <com/sun/star/view/XRenderable.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
@@ -76,7 +77,7 @@ Sequence< OUString > SAL_CALL SWFDialog_getSupportedServiceNames()
 Reference< XInterface > SAL_CALL SWFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
     throw( Exception )
 {
-    return (cppu::OWeakObject*) new SWFDialog( rSMgr );
+    return (cppu::OWeakObject*) new SWFDialog( comphelper::getComponentContext(rSMgr) );
 }
 
 // -----------------------------------------------------------------------------
@@ -87,8 +88,8 @@ Reference< XInterface > SAL_CALL SWFDialog_createInstance( const Reference< XMul
 // - SWFDialog -
 // -------------
 
-SWFDialog::SWFDialog( const Reference< XMultiServiceFactory > &rxMSF ) :
-    OGenericUnoDialog( rxMSF )
+SWFDialog::SWFDialog( const Reference< XComponentContext> &rxContext ) :
+    OGenericUnoDialog( rxContext )
 {
     mpResMgr = ResMgr::CreateResMgr( "flash", Application::GetSettings().GetUILanguageTag().getLocale() );
 }
diff --git a/filter/source/flash/swfdialog.hxx b/filter/source/flash/swfdialog.hxx
index 644454194eed..382a1027a4cc 100644
--- a/filter/source/flash/swfdialog.hxx
+++ b/filter/source/flash/swfdialog.hxx
@@ -72,7 +72,7 @@ protected:
 
 public:
 
-                SWFDialog( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxMSF );
+                SWFDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext );
     virtual     ~SWFDialog();
 };
 
diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx
index 2755af0cde83..11d67b249419 100644
--- a/filter/source/pdf/pdfdialog.cxx
+++ b/filter/source/pdf/pdfdialog.cxx
@@ -71,7 +71,7 @@ Sequence< OUString > SAL_CALL PDFDialog_getSupportedServiceNames()
 Reference< XInterface > SAL_CALL PDFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
     throw( Exception )
 {
-    return (cppu::OWeakObject*) new PDFDialog( rSMgr );
+    return (cppu::OWeakObject*) new PDFDialog( comphelper::getComponentContext(rSMgr) );
 }
 
 // -----------------------------------------------------------------------------
@@ -82,8 +82,8 @@ Reference< XInterface > SAL_CALL PDFDialog_createInstance( const Reference< XMul
 // - PDFDialog -
 // -------------
 
-PDFDialog::PDFDialog( const Reference< XMultiServiceFactory > &rxMSF )
-: PDFDialog_Base( rxMSF )
+PDFDialog::PDFDialog( const Reference< XComponentContext > &rxContext )
+: PDFDialog_Base( rxContext )
 {
 }
 
@@ -125,7 +125,7 @@ Dialog* PDFDialog::createDialog( Window* pParent )
 
     if( mxSrcDoc.is() )
     {
-        ImpPDFTabDialog* pDlg = new ImpPDFTabDialog( pParent, maFilterData, mxSrcDoc, m_aContext.getLegacyServiceFactory() );
+        ImpPDFTabDialog* pDlg = new ImpPDFTabDialog( pParent, maFilterData, mxSrcDoc, uno::Reference<lang::XMultiServiceFactory>(m_aContext->getServiceManager(), uno::UNO_QUERY_THROW) );
         pRet = pDlg;
     }
 
diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx
index 23afa3d92796..23504bee589f 100644
--- a/filter/source/pdf/pdfdialog.hxx
+++ b/filter/source/pdf/pdfdialog.hxx
@@ -68,7 +68,7 @@ protected:
 
 public:
 
-                PDFDialog( const Reference< XMultiServiceFactory >& rxMSF );
+                PDFDialog( const Reference< XComponentContext >& rxContext );
     virtual     ~PDFDialog();
 };
 
diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx
index 7b7ece1f9bb0..b400c153b8fe 100644
--- a/filter/source/svg/svgdialog.cxx
+++ b/filter/source/svg/svgdialog.cxx
@@ -22,6 +22,7 @@
 
 #include <vcl/svapp.hxx>
 #include <vcl/dialog.hxx>
+#include <comphelper/processfactory.hxx>
 
 #include <com/sun/star/view/XRenderable.hpp>
 #include <com/sun/star/frame/XController.hpp>
@@ -78,15 +79,15 @@ Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames()
 Reference< XInterface > SAL_CALL SVGDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr )
     throw( Exception )
 {
-    return( static_cast< cppu::OWeakObject* >( new SVGDialog( rSMgr ) ) );
+    return( static_cast< cppu::OWeakObject* >( new SVGDialog( comphelper::getComponentContext(rSMgr) ) ) );
 }
 
 // -------------
 // - SVGDialog -
 // -------------
 
-SVGDialog::SVGDialog( const Reference< XMultiServiceFactory > &rxMSF ) :
-    OGenericUnoDialog( rxMSF )
+SVGDialog::SVGDialog( const Reference< XComponentContext > &rxContext ) :
+    OGenericUnoDialog( rxContext )
 {
 }
 
diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx
index 32129f148b91..928d9a9b0358 100644
--- a/filter/source/svg/svgdialog.hxx
+++ b/filter/source/svg/svgdialog.hxx
@@ -76,7 +76,7 @@ protected:
 
 public:
 
-                SVGDialog( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxMSF );
+                SVGDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext );
     virtual     ~SVGDialog();
 };