fdo#46808, remove some more XMultiServiceFactory fields

Change-Id: I8d039a933c9fde1a24b35954bb5a1f151e9aa160

5 files changed, 15 insertions, 24 deletions

diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx
index 6b30490cbc7d..2f83fb82608a 100644
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
@@ -60,12 +60,12 @@ using namespace chelp;
 //=========================================================================
 //=========================================================================
 
-Content::Content( const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
+Content::Content( const uno::Reference< uno::XComponentContext >& rxContext,
                   ::ucbhelper::ContentProviderImplHelper* pProvider,
                   const uno::Reference< ucb::XContentIdentifier >&
                       Identifier,
                   Databases* pDatabases )
-    : ContentImplHelper( rxSMgr, pProvider, Identifier ),
+    : ContentImplHelper( rxContext, pProvider, Identifier ),
       m_aURLParameter( Identifier->getContentIdentifier(),pDatabases ),
       m_pDatabases( pDatabases ) // not owner
 {
@@ -360,8 +360,7 @@ uno::Any SAL_CALL Content::execute(
             aOpenCommand.Sink, uno::UNO_QUERY);
 
         if(xActiveDataSink.is())
-            m_aURLParameter.open(m_xSMgr,
-                                 aCommand,
+            m_aURLParameter.open(aCommand,
                                  CommandId,
                                  Environment,
                                  xActiveDataSink);
@@ -378,8 +377,7 @@ uno::Any SAL_CALL Content::execute(
             aOpenCommand.Sink, uno::UNO_QUERY);
 
         if(xOutputStream.is() )
-            m_aURLParameter.open(m_xSMgr,
-                                 aCommand,
+            m_aURLParameter.open(aCommand,
                                  CommandId,
                                  Environment,
                                  xOutputStream);
@@ -388,12 +386,12 @@ uno::Any SAL_CALL Content::execute(
         {
             uno::Reference< ucb::XDynamicResultSet > xSet
                 = new DynamicResultSet(
-                    comphelper::getComponentContext(m_xSMgr),
+                    m_xContext,
                     this,
                     aOpenCommand,
                     Environment,
                     new ResultSetForRootFactory(
-                        comphelper::getComponentContext(m_xSMgr),
+                        m_xContext,
                         m_xProvider.get(),
                         aOpenCommand.Mode,
                         aOpenCommand.Properties,
@@ -406,12 +404,12 @@ uno::Any SAL_CALL Content::execute(
         {
             uno::Reference< ucb::XDynamicResultSet > xSet
                 = new DynamicResultSet(
-                    comphelper::getComponentContext(m_xSMgr),
+                    m_xContext,
                     this,
                     aOpenCommand,
                     Environment,
                     new ResultSetForQueryFactory(
-                        comphelper::getComponentContext(m_xSMgr),
+                        m_xContext,
                         m_xProvider.get(),
                         aOpenCommand.Mode,
                         aOpenCommand.Properties,
@@ -443,7 +441,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
     osl::MutexGuard aGuard( m_aMutex );
 
     rtl::Reference< ::ucbhelper::PropertyValueSet > xRow =
-        new ::ucbhelper::PropertyValueSet( m_xSMgr );
+        new ::ucbhelper::PropertyValueSet( m_xContext );
 
     for ( sal_Int32 n = 0; n < rProperties.getLength(); ++n )
     {
diff --git a/xmlhelp/source/cxxhelp/provider/content.hxx b/xmlhelp/source/cxxhelp/provider/content.hxx
index 4616a46ca892..f8a1a63914b7 100644
--- a/xmlhelp/source/cxxhelp/provider/content.hxx
+++ b/xmlhelp/source/cxxhelp/provider/content.hxx
@@ -62,7 +62,7 @@ namespace chelp
     public:
 
         Content( const ::com::sun::star::uno::Reference<
-                 ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
+                 ::com::sun::star::uno::XComponentContext >& rxContext,
                  ::ucbhelper::ContentProviderImplHelper* pProvider,
                  const ::com::sun::star::uno::Reference<
                  ::com::sun::star::ucb::XContentIdentifier >& Identifier,
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index f5d6819c4dc6..e6806c69dc6b 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -207,7 +207,7 @@ ContentProvider::queryContent(
     if ( xContent.is() )
         return xContent;
 
-    xContent = new Content( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), this, xCanonicId, m_pDatabases );
+    xContent = new Content( m_xContext, this, xCanonicId, m_pDatabases );
 
     // register new content
     registerNewContent( xContent );
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 4303a7f23bd9..386f4662f8f8 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -389,13 +389,11 @@ private:
 
 
 
-void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr,
-                         const Command& aCommand,
+void URLParameter::open( const Command& aCommand,
                          sal_Int32 CommandId,
                          const Reference< XCommandEnvironment >& Environment,
                          const Reference< XOutputStream >& xDataSink )
 {
-    (void)rxSMgr;
     (void)aCommand;
     (void)CommandId;
     (void)Environment;
@@ -462,13 +460,11 @@ void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr,
 
 
 
-void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr,
-                         const Command& aCommand,
+void URLParameter::open( const Command& aCommand,
                          sal_Int32 CommandId,
                          const Reference< XCommandEnvironment >& Environment,
                          const Reference< XActiveDataSink >& xDataSink )
 {
-    (void)rxSMgr;
     (void)aCommand;
     (void)CommandId;
     (void)Environment;
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
index 67789d1420bb..2e7ba31e1463 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
@@ -23,7 +23,6 @@
 #include <rtl/ustring.hxx>
 #include <rtl/string.hxx>
 #include <com/sun/star/ucb/IllegalIdentifierException.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/io/XActiveDataSink.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
@@ -169,14 +168,12 @@ namespace chelp {
 
         rtl::OString getByName( const char* par );
 
-        void open( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
-                   const com::sun::star::ucb::Command& aCommand,
+        void open( const com::sun::star::ucb::Command& aCommand,
                    sal_Int32 CommandId,
                    const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment,
                    const com::sun::star::uno::Reference< com::sun::star::io::XActiveDataSink >& xDataSink );
 
-        void open( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
-                   const com::sun::star::ucb::Command& aCommand,
+        void open( const com::sun::star::ucb::Command& aCommand,
                    sal_Int32 CommandId,
                    const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment,
                    const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xDataSink );