diff options
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/Accessibility/AccessibleContextBase.cxx | 34 | ||||
-rw-r--r-- | sc/source/ui/inc/AccessibleContextBase.hxx | 28 |
2 files changed, 2 insertions, 60 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index 0fc5b42a1ffe..f66f51077ca8 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -95,29 +95,8 @@ void SAL_CALL ScAccessibleContextBase::disposing() xBroadcaster->removeAccessibleEventListener(this); mxParent = nullptr; } - - ScAccessibleContextBaseWeakImpl::disposing(); } -//===== XInterface ===================================================== - -uno::Any SAL_CALL ScAccessibleContextBase::queryInterface( uno::Type const & rType ) -{ - uno::Any aAny (ScAccessibleContextBaseWeakImpl::queryInterface(rType)); - return aAny.hasValue() ? aAny : ScAccessibleContextBaseImplEvent::queryInterface(rType); -} - -void SAL_CALL ScAccessibleContextBase::acquire() - noexcept -{ - ScAccessibleContextBaseWeakImpl::acquire(); -} - -void SAL_CALL ScAccessibleContextBase::release() - noexcept -{ - ScAccessibleContextBaseWeakImpl::release(); -} //===== SfxListener ===================================================== @@ -432,19 +411,6 @@ uno::Sequence< OUString> SAL_CALL "com.sun.star.accessibility.AccessibleContext"}; } -//===== XTypeProvider ======================================================= - -uno::Sequence< uno::Type > SAL_CALL ScAccessibleContextBase::getTypes() -{ - return comphelper::concatSequences(ScAccessibleContextBaseWeakImpl::getTypes(), ScAccessibleContextBaseImplEvent::getTypes()); -} - -uno::Sequence<sal_Int8> SAL_CALL - ScAccessibleContextBase::getImplementationId() -{ - return css::uno::Sequence<sal_Int8>(); -} - //===== internal ============================================================ OUString diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 0df386d6edd5..b7276873487f 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -44,17 +44,13 @@ typedef cppu::WeakComponentImplHelper< css::accessibility::XAccessibleComponent, css::accessibility::XAccessibleContext, css::accessibility::XAccessibleEventBroadcaster, - css::lang::XServiceInfo - > ScAccessibleContextBaseWeakImpl; - -typedef cppu::ImplHelper1< + css::lang::XServiceInfo, css::accessibility::XAccessibleEventListener - > ScAccessibleContextBaseImplEvent; + > ScAccessibleContextBaseWeakImpl; class ScAccessibleContextBase : public cppu::BaseMutex, public ScAccessibleContextBaseWeakImpl, - public ScAccessibleContextBaseImplEvent, public SfxListener { public: @@ -79,15 +75,6 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - ///===== XInterface ===================================================== - - virtual css::uno::Any SAL_CALL queryInterface( - css::uno::Type const & rType ) override; - - virtual void SAL_CALL acquire() noexcept override; - - virtual void SAL_CALL release() noexcept override; - ///===== XAccessible ===================================================== /// Return the XAccessibleContext. @@ -200,17 +187,6 @@ public: virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() override; - ///===== XTypeProvider =================================================== - - /// returns the possible types - virtual css::uno::Sequence< css::uno::Type > SAL_CALL - getTypes() override; - - /** Returns an implementation id. - */ - virtual css::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId() override; - protected: /// Return this object's description. /// |