diff options
| -rw-r--r-- | include/ucbhelper/contentinfo.hxx | 17 | ||||
| -rw-r--r-- | ucbhelper/source/provider/contentinfo.cxx | 32 |
2 files changed, 1 insertions, 48 deletions
diff --git a/include/ucbhelper/contentinfo.hxx b/include/ucbhelper/contentinfo.hxx index f3f455af98ff..405b1057b3a3 100644 --- a/include/ucbhelper/contentinfo.hxx +++ b/include/ucbhelper/contentinfo.hxx @@ -86,9 +86,7 @@ public: * ucb::ContentImplHelper. */ class CommandProcessorInfo : - public cppu::OWeakObject, - public css::lang::XTypeProvider, - public css::ucb::XCommandInfo + public cppu::WeakImplHelper<css::ucb::XCommandInfo> { css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv; @@ -108,19 +106,6 @@ public: ContentImplHelper* pContent ); virtual ~CommandProcessorInfo() override; - // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - virtual void SAL_CALL acquire() - throw() override; - virtual void SAL_CALL release() - throw() override; - - // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL - getImplementationId() override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL - getTypes() override; - // XCommandInfo virtual css::uno::Sequence< css::ucb::CommandInfo > SAL_CALL diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx index 64feb16e2b74..a0a26745b758 100644 --- a/ucbhelper/source/provider/contentinfo.cxx +++ b/ucbhelper/source/provider/contentinfo.cxx @@ -191,38 +191,6 @@ CommandProcessorInfo::~CommandProcessorInfo() } -// XInterface methods. - - -void SAL_CALL CommandProcessorInfo::acquire() - throw() -{ - OWeakObject::acquire(); -} - -void SAL_CALL CommandProcessorInfo::release() - throw() -{ - OWeakObject::release(); -} - -css::uno::Any SAL_CALL CommandProcessorInfo::queryInterface( const css::uno::Type & rType ) -{ - css::uno::Any aRet = cppu::queryInterface( rType, - static_cast< lang::XTypeProvider* >(this), - static_cast< css::ucb::XCommandInfo* >(this) - ); - return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); -} - -// XTypeProvider methods. - - -XTYPEPROVIDER_IMPL_2( CommandProcessorInfo, - lang::XTypeProvider, - css::ucb::XCommandInfo ); - - // XCommandInfo methods. |