fdo#46808, convert ucbhelper::ResultSet to XComponentContext

Along the way, remove the XMultiServiceFactory member from
a few classes that were not using it.

Change-Id: I9ee2c2ebc01144301ed8e489bd92b4695ff263d0

14 files changed, 36 insertions, 33 deletions

diff --git a/ucb/Library_ucpgio1.mk b/ucb/Library_ucpgio1.mk
index 27c7dea74ae3..f7ed767a0a49 100644
--- a/ucb/Library_ucpgio1.mk
+++ b/ucb/Library_ucpgio1.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Library_set_componentfile,ucpgio1,ucb/source/ucp/gio/ucpgio))
 $(eval $(call gb_Library_use_sdk_api,ucpgio1))
 
 $(eval $(call gb_Library_use_libraries,ucpgio1,\
+	comphelper \
 	cppu \
 	cppuhelper \
 	sal \
diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.cxx b/ucb/source/ucp/cmis/cmis_datasupplier.cxx
index 5d075740b0de..79de0590c6ac 100644
--- a/ucb/source/ucp/cmis/cmis_datasupplier.cxx
+++ b/ucb/source/ucp/cmis/cmis_datasupplier.cxx
@@ -28,9 +28,8 @@ namespace cmis
 
     typedef std::vector< ResultListEntry* > ResultList;
 
-    DataSupplier::DataSupplier( const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
-        ChildrenProvider* pChildrenProvider, sal_Int32 nOpenMode )
-        : m_pChildrenProvider( pChildrenProvider ), m_xSMgr(rxSMgr), mnOpenMode(nOpenMode), mbCountFinal(false)
+    DataSupplier::DataSupplier( ChildrenProvider* pChildrenProvider, sal_Int32 nOpenMode )
+        : m_pChildrenProvider( pChildrenProvider ), mnOpenMode(nOpenMode), mbCountFinal(false)
     {
     }
 
diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.hxx b/ucb/source/ucp/cmis/cmis_datasupplier.hxx
index 7a3b42060ffa..a2d4db58a324 100644
--- a/ucb/source/ucp/cmis/cmis_datasupplier.hxx
+++ b/ucb/source/ucp/cmis/cmis_datasupplier.hxx
@@ -41,15 +41,13 @@ namespace cmis
     {
         private:
             ChildrenProvider* m_pChildrenProvider;
-            com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xSMgr;
             sal_Int32 mnOpenMode;
             bool mbCountFinal;
             bool getData();
             ResultList maResults;
 
         public:
-            DataSupplier( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
-                ChildrenProvider* pChildrenProvider, sal_Int32 nOpenMode );
+            DataSupplier( ChildrenProvider* pChildrenProvider, sal_Int32 nOpenMode );
 
             virtual ~DataSupplier();
 
diff --git a/ucb/source/ucp/cmis/cmis_resultset.cxx b/ucb/source/ucp/cmis/cmis_resultset.cxx
index 86ed3cacccce..a9d4f8311971 100644
--- a/ucb/source/ucp/cmis/cmis_resultset.cxx
+++ b/ucb/source/ucp/cmis/cmis_resultset.cxx
@@ -9,6 +9,7 @@
 
 #include "cmis_datasupplier.hxx"
 #include "cmis_resultset.hxx"
+#include <comphelper/processfactory.hxx>
 
 using namespace com::sun::star::lang;
 using namespace com::sun::star::ucb;
@@ -30,8 +31,8 @@ namespace cmis
     void DynamicResultSet::initStatic()
     {
         m_xResultSet1 = new ::ucbhelper::ResultSet(
-            m_xSMgr, m_aCommand.Properties,
-            new DataSupplier( m_xSMgr, m_pChildrenProvider, m_aCommand.Mode ), m_xEnv );
+            comphelper::getComponentContext(m_xSMgr), m_aCommand.Properties,
+            new DataSupplier( m_pChildrenProvider, m_aCommand.Mode ), m_xEnv );
     }
 
     void DynamicResultSet::initDynamic()
diff --git a/ucb/source/ucp/ext/ucpext_resultset.cxx b/ucb/source/ucp/ext/ucpext_resultset.cxx
index 73fe97431f93..3097a65f7693 100644
--- a/ucb/source/ucp/ext/ucpext_resultset.cxx
+++ b/ucb/source/ucp/ext/ucpext_resultset.cxx
@@ -22,6 +22,7 @@
 #include "ucpext_datasupplier.hxx"
 
 #include <ucbhelper/resultset.hxx>
+#include <comphelper/processfactory.hxx>
 
 //......................................................................................................................
 namespace ucb { namespace ucp { namespace ext
@@ -67,7 +68,7 @@ namespace ucb { namespace ucp { namespace ext
             m_aCommand.Mode
         ) );
         m_xResultSet1 = new ::ucbhelper::ResultSet(
-            m_xSMgr,
+            comphelper::getComponentContext(m_xSMgr),
             m_aCommand.Properties,
             pDataSupplier.get(),
             m_xEnvironment
diff --git a/ucb/source/ucp/gio/gio_resultset.cxx b/ucb/source/ucp/gio/gio_resultset.cxx
index b732296ce674..862baf896f01 100644
--- a/ucb/source/ucp/gio/gio_resultset.cxx
+++ b/ucb/source/ucp/gio/gio_resultset.cxx
@@ -19,6 +19,7 @@
 
 #include "gio_datasupplier.hxx"
 #include "gio_resultset.hxx"
+#include "comphelper/processfactory.hxx"
 
 using namespace com::sun::star::lang;
 using namespace com::sun::star::ucb;
@@ -40,7 +41,7 @@ DynamicResultSet::DynamicResultSet(
 void DynamicResultSet::initStatic()
 {
     m_xResultSet1 = new ::ucbhelper::ResultSet(
-        m_xSMgr, m_aCommand.Properties,
+        comphelper::getComponentContext(m_xSMgr), m_aCommand.Properties,
         new DataSupplier( m_xSMgr, m_xContent, m_aCommand.Mode ), m_xEnv );
 }
 
diff --git a/ucb/source/ucp/gvfs/gvfs_directory.cxx b/ucb/source/ucp/gvfs/gvfs_directory.cxx
index 7ece3b2eb5ce..52c8fc11b65a 100644
--- a/ucb/source/ucp/gvfs/gvfs_directory.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_directory.cxx
@@ -31,6 +31,7 @@
 
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libgnomevfs/gnome-vfs-directory.h>
+#include <comphelper/processfactory.hxx>
 
 using namespace com::sun::star;
 using namespace gvfs;
@@ -50,10 +51,9 @@ DynamicResultSet::DynamicResultSet(
 void DynamicResultSet::initStatic()
 {
     m_xResultSet1
-        = new ::ucbhelper::ResultSet( m_xSMgr,
+        = new ::ucbhelper::ResultSet( comphelper::getComponentContext(m_xSMgr),
                                       m_aCommand.Properties,
-                                      new DataSupplier( m_xSMgr,
-                                                        m_xContent,
+                                      new DataSupplier( m_xContent,
                                                         m_aCommand.Mode ),
                                       m_xEnv );
 }
@@ -108,15 +108,13 @@ struct gvfs::DataSupplier_Impl
     osl::Mutex                                   m_aMutex;
     ResultList                                   m_aResults;
     rtl::Reference< Content >                    m_xContent;
-    uno::Reference< lang::XMultiServiceFactory > m_xSMgr;
     sal_Int32                                    m_nOpenMode;
     sal_Bool                                     m_bCountFinal;
 
     DataSupplier_Impl(
-              const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
               const rtl::Reference< Content >& rContent,
               sal_Int32 nOpenMode )
-        : m_xContent( rContent ), m_xSMgr( rxSMgr ),
+        : m_xContent( rContent ),
           m_nOpenMode( nOpenMode ), m_bCountFinal( sal_False ) {}
     ~DataSupplier_Impl()
     {
@@ -132,10 +130,9 @@ struct gvfs::DataSupplier_Impl
 };
 
 DataSupplier::DataSupplier(
-            const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
             const rtl::Reference< Content >& rContent,
             sal_Int32 nOpenMode )
-: m_pImpl( new DataSupplier_Impl( rxSMgr, rContent, nOpenMode ) )
+: m_pImpl( new DataSupplier_Impl( rContent, nOpenMode ) )
 {
 }
 
diff --git a/ucb/source/ucp/gvfs/gvfs_directory.hxx b/ucb/source/ucp/gvfs/gvfs_directory.hxx
index 45273b7de82d..709b71fdef04 100644
--- a/ucb/source/ucp/gvfs/gvfs_directory.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_directory.hxx
@@ -54,9 +54,7 @@ private:
     sal_Bool getData();
 
 public:
-    DataSupplier( const com::sun::star::uno::Reference<
-              com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
-              const rtl::Reference< Content >& rContent,
+    DataSupplier(const rtl::Reference< Content >& rContent,
               sal_Int32 nOpenMode);
 
     virtual ~DataSupplier();
diff --git a/ucb/source/ucp/hierarchy/dynamicresultset.cxx b/ucb/source/ucp/hierarchy/dynamicresultset.cxx
index 92df5b97a205..bb7d735b84db 100644
--- a/ucb/source/ucp/hierarchy/dynamicresultset.cxx
+++ b/ucb/source/ucp/hierarchy/dynamicresultset.cxx
@@ -28,6 +28,7 @@
  *************************************************************************/
 #include "hierarchydatasupplier.hxx"
 #include "dynamicresultset.hxx"
+#include <comphelper/processfactory.hxx>
 
 using namespace com::sun::star;
 using namespace hierarchy_ucp;
@@ -59,7 +60,7 @@ void DynamicResultSet::initStatic()
 {
     m_xResultSet1
         = new ::ucbhelper::ResultSet(
-            m_xSMgr,
+            comphelper::getComponentContext(m_xSMgr),
             m_aCommand.Properties,
             new  HierarchyResultSetDataSupplier( m_xSMgr,
                                                  m_xContent,
@@ -71,7 +72,7 @@ void DynamicResultSet::initDynamic()
 {
     m_xResultSet1
         = new ::ucbhelper::ResultSet(
-            m_xSMgr,
+            comphelper::getComponentContext(m_xSMgr),
             m_aCommand.Properties,
             new  HierarchyResultSetDataSupplier( m_xSMgr,
                                                  m_xContent,
diff --git a/ucb/source/ucp/odma/odma_resultset.cxx b/ucb/source/ucp/odma/odma_resultset.cxx
index 3099cbd97e99..c94f340ed7fa 100644
--- a/ucb/source/ucp/odma/odma_resultset.cxx
+++ b/ucb/source/ucp/odma/odma_resultset.cxx
@@ -32,6 +32,7 @@
  *************************************************************************/
 #include "odma_datasupplier.hxx"
 #include "odma_resultset.hxx"
+#include "comphelper/processfactory.hxx"
 
 using namespace com::sun::star::lang;
 using namespace com::sun::star::ucb;
@@ -67,7 +68,7 @@ DynamicResultSet::DynamicResultSet(
 void DynamicResultSet::initStatic()
 {
     m_xResultSet1
-        = new ::ucbhelper::ResultSet( m_xSMgr,
+        = new ::ucbhelper::ResultSet( comphelper::getComponentContext(m_xSMgr),
                                       m_aCommand.Properties,
                                       new DataSupplier( m_xSMgr,
                                                         m_xContent,
@@ -79,7 +80,7 @@ void DynamicResultSet::initStatic()
 void DynamicResultSet::initDynamic()
 {
     m_xResultSet1
-        = new ::ucbhelper::ResultSet( m_xSMgr,
+        = new ::ucbhelper::ResultSet( comphelper::getComponentContext(m_xSMgr),
                                       m_aCommand.Properties,
                                       new DataSupplier( m_xSMgr,
                                                         m_xContent,
diff --git a/ucb/source/ucp/package/pkgresultset.cxx b/ucb/source/ucp/package/pkgresultset.cxx
index 28b097d84a76..d4f353761766 100644
--- a/ucb/source/ucp/package/pkgresultset.cxx
+++ b/ucb/source/ucp/package/pkgresultset.cxx
@@ -28,6 +28,7 @@
  *************************************************************************/
 #include "pkgdatasupplier.hxx"
 #include "pkgresultset.hxx"
+#include <comphelper/processfactory.hxx>
 
 using namespace com::sun::star;
 
@@ -61,7 +62,7 @@ DynamicResultSet::DynamicResultSet(
 void DynamicResultSet::initStatic()
 {
     m_xResultSet1
-        = new ::ucbhelper::ResultSet( m_xSMgr,
+        = new ::ucbhelper::ResultSet( comphelper::getComponentContext(m_xSMgr),
                                       m_aCommand.Properties,
                                       new DataSupplier( m_xSMgr,
                                                         m_xContent,
@@ -73,7 +74,7 @@ void DynamicResultSet::initStatic()
 void DynamicResultSet::initDynamic()
 {
     m_xResultSet1
-        = new ::ucbhelper::ResultSet( m_xSMgr,
+        = new ::ucbhelper::ResultSet( comphelper::getComponentContext(m_xSMgr),
                                       m_aCommand.Properties,
                                       new DataSupplier( m_xSMgr,
                                                         m_xContent,
diff --git a/ucb/source/ucp/tdoc/tdoc_resultset.cxx b/ucb/source/ucp/tdoc/tdoc_resultset.cxx
index 0faed835da42..7fc027ce899e 100644
--- a/ucb/source/ucp/tdoc/tdoc_resultset.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_resultset.cxx
@@ -32,6 +32,7 @@
 #include "tdoc_datasupplier.hxx"
 #include "tdoc_resultset.hxx"
 #include "tdoc_content.hxx"
+#include <comphelper/processfactory.hxx>
 
 using namespace com::sun::star;
 using namespace tdoc_ucp;
@@ -63,7 +64,7 @@ void DynamicResultSet::initStatic()
 {
     m_xResultSet1
         = new ::ucbhelper::ResultSet(
-            m_xSMgr,
+            comphelper::getComponentContext(m_xSMgr),
             m_aCommand.Properties,
             new ResultSetDataSupplier( m_xSMgr,
                                        m_xContent,
@@ -75,7 +76,7 @@ void DynamicResultSet::initDynamic()
 {
     m_xResultSet1
         = new ::ucbhelper::ResultSet(
-            m_xSMgr,
+            comphelper::getComponentContext(m_xSMgr),
             m_aCommand.Properties,
             new ResultSetDataSupplier( m_xSMgr,
                                        m_xContent,
diff --git a/ucb/source/ucp/webdav-neon/webdavresultset.cxx b/ucb/source/ucp/webdav-neon/webdavresultset.cxx
index e74354855f86..dbd51a51ebbc 100644
--- a/ucb/source/ucp/webdav-neon/webdavresultset.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavresultset.cxx
@@ -37,6 +37,7 @@
  *************************************************************************/
 #include "webdavresultset.hxx"
 #include "DAVSession.hxx"
+#include <comphelper/processfactory.hxx>
 
 using namespace com::sun::star;
 using namespace webdav_ucp;
@@ -69,7 +70,7 @@ DynamicResultSet::DynamicResultSet(
 void DynamicResultSet::initStatic()
 {
     m_xResultSet1
-        = new ::ucbhelper::ResultSet( m_xSMgr,
+        = new ::ucbhelper::ResultSet( comphelper::getComponentContext(m_xSMgr),
                                       m_aCommand.Properties,
                                       new DataSupplier( m_xSMgr,
                                                         m_xContent,
@@ -81,7 +82,7 @@ void DynamicResultSet::initStatic()
 void DynamicResultSet::initDynamic()
 {
     m_xResultSet1
-        = new ::ucbhelper::ResultSet( m_xSMgr,
+        = new ::ucbhelper::ResultSet( comphelper::getComponentContext(m_xSMgr),
                                       m_aCommand.Properties,
                                       new DataSupplier( m_xSMgr,
                                                         m_xContent,
diff --git a/ucb/source/ucp/webdav/webdavresultset.cxx b/ucb/source/ucp/webdav/webdavresultset.cxx
index 602778900d7b..1587d9ba1e41 100644
--- a/ucb/source/ucp/webdav/webdavresultset.cxx
+++ b/ucb/source/ucp/webdav/webdavresultset.cxx
@@ -30,6 +30,8 @@
 #include "DAVSession.hxx"
 #endif
 
+#include "comphelper/processfactory.hxx"
+
 using namespace com::sun::star;
 using namespace http_dav_ucp;
 
@@ -61,7 +63,7 @@ DynamicResultSet::DynamicResultSet(
 void DynamicResultSet::initStatic()
 {
     m_xResultSet1
-        = new ::ucbhelper::ResultSet( m_xSMgr,
+        = new ::ucbhelper::ResultSet( comphelper::getComponentContext(m_xSMgr),
                                       m_aCommand.Properties,
                                       new DataSupplier( m_xSMgr,
                                                         m_xContent,
@@ -73,7 +75,7 @@ void DynamicResultSet::initStatic()
 void DynamicResultSet::initDynamic()
 {
     m_xResultSet1
-        = new ::ucbhelper::ResultSet( m_xSMgr,
+        = new ::ucbhelper::ResultSet( comphelper::getComponentContext(m_xSMgr),
                                       m_aCommand.Properties,
                                       new DataSupplier( m_xSMgr,
                                                         m_xContent,