diff options
| author | Noel Grandin <noel@peralex.com> | 2012-11-08 08:50:18 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-28 13:06:18 +0100 |
| commit | 7e708545e4e32910d93cd471eb8438dca4ab47b6 (patch) | |
| tree | 14368fd2bda504dcdfce8c222dfaaa40dbbf8e18 /ucbhelper | |
| parent | 60f6c7578b2ba9e78d1aa9589b315aec6b489a16 (diff) | |
fdo#46808, remove some more XMultiServiceFactory fields
Change-Id: Ida82837f6eaca1a59e85f5e9798084096d07b1a3
Diffstat (limited to 'ucbhelper')
| -rw-r--r-- | ucbhelper/inc/ucbhelper/contentinfo.hxx | 9 | ||||
| -rw-r--r-- | ucbhelper/source/provider/contenthelper.cxx | 4 | ||||
| -rw-r--r-- | ucbhelper/source/provider/contentinfo.cxx | 8 |
3 files changed, 4 insertions, 17 deletions
diff --git a/ucbhelper/inc/ucbhelper/contentinfo.hxx b/ucbhelper/inc/ucbhelper/contentinfo.hxx index db68370f3591..77dcd5850e58 100644 --- a/ucbhelper/inc/ucbhelper/contentinfo.hxx +++ b/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(); diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx index e09a5ab84559..92deb602ad0d 100644 --- a/ucbhelper/source/provider/contenthelper.cxx +++ b/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(); diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx index 93aa47206aaa..54c62347e493 100644 --- a/ucbhelper/source/provider/contentinfo.cxx +++ b/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 ) { |