fdo#46808, remove some more XMultiServiceFactory fields

Change-Id: Ida82837f6eaca1a59e85f5e9798084096d07b1a3

ucbhelper/inc/ucbhelper/contentinfo.hxx

@@ -22,7 +22,6 @@
 
 #include <com/sun/star/ucb/XCommandInfo.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <cppuhelper/weak.hxx>
@@ -51,8 +50,6 @@ class PropertySetInfo :
                 public com::sun::star::lang::XTypeProvider,
                 public com::sun::star::beans::XPropertySetInfo
 {
-    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
-                                m_xSMgr;
     com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >
                                 m_xEnv;
     com::sun::star::uno::Sequence< com::sun::star::beans::Property >*
@@ -66,8 +63,6 @@ private:
 
 public:
     PropertySetInfo( const com::sun::star::uno::Reference<
-                        com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
-                     const com::sun::star::uno::Reference<
                         com::sun::star::ucb::XCommandEnvironment >& rxEnv,
                      ContentImplHelper* pContent );
     virtual ~PropertySetInfo();
@@ -111,8 +106,6 @@ class CommandProcessorInfo :
                 public com::sun::star::lang::XTypeProvider,
                 public com::sun::star::ucb::XCommandInfo
 {
-    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
-                                m_xSMgr;
     com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >
                                 m_xEnv;
     com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo >*
@@ -128,8 +121,6 @@ private:
 
 public:
     CommandProcessorInfo( const com::sun::star::uno::Reference<
-                            com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
-                           const com::sun::star::uno::Reference<
                             com::sun::star::ucb::XCommandEnvironment >& rxEnv,
                          ContentImplHelper* pContent );
     virtual ~CommandProcessorInfo();

ucbhelper/source/provider/contenthelper.cxx

@@ -1063,7 +1063,7 @@ ContentImplHelper::getCommandInfo(
 
     if ( !m_pImpl->m_xCommandsInfo.is() )
         m_pImpl->m_xCommandsInfo
-            = new CommandProcessorInfo( m_xSMgr, xEnv, this );
+            = new CommandProcessorInfo( xEnv, this );
     else if ( !bCache )
         m_pImpl->m_xCommandsInfo->reset();
 
@@ -1081,7 +1081,7 @@ ContentImplHelper::getPropertySetInfo(
 
     if ( !m_pImpl->m_xPropSetInfo.is() )
         m_pImpl->m_xPropSetInfo
-            = new PropertySetInfo( m_xSMgr, xEnv, this );
+            = new PropertySetInfo( xEnv, this );
     else if ( !bCache )
         m_pImpl->m_xPropSetInfo->reset();
 

ucbhelper/source/provider/contentinfo.cxx

@@ -43,11 +43,9 @@ using namespace com::sun::star;
 namespace ucbhelper {
 
 PropertySetInfo::PropertySetInfo(
-    const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
     const uno::Reference< com::sun::star::ucb::XCommandEnvironment >& rxEnv,
     ContentImplHelper* pContent )
-: m_xSMgr( rxSMgr ),
-  m_xEnv( rxEnv ),
+: m_xEnv( rxEnv ),
   m_pProps( 0 ),
   m_pContent( pContent )
 {
@@ -218,11 +216,9 @@ sal_Bool PropertySetInfo::queryProperty(
 //=========================================================================
 
 CommandProcessorInfo::CommandProcessorInfo(
-    const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
     const uno::Reference< com::sun::star::ucb::XCommandEnvironment >& rxEnv,
     ContentImplHelper* pContent )
-: m_xSMgr( rxSMgr ),
-  m_xEnv( rxEnv ),
+: m_xEnv( rxEnv ),
   m_pCommands( 0 ),
   m_pContent( pContent )
 {