diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-21 22:48:02 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-21 22:48:02 +0200 |
commit | da36fc8c9564199b8c2f8f28c2e4d04d9862a2d4 (patch) | |
tree | 400debf337538fa246a3eb280a4664f17fccfff8 /include | |
parent | e468131fa45fcdf8fe3ef693887f444a6ff1fdbe (diff) |
No more need for PartialWeakComponentImplHelper here
...since 70626249cd247d9acdad417b8eaf252bae22c059 "API CHANGE a11y unpublishing
and add/removeListener rename."
Change-Id: I89d81326d97712abcac94c3436a13905954c55cf
Diffstat (limited to 'include')
-rw-r--r-- | include/comphelper/accessiblewrapper.hxx | 9 | ||||
-rw-r--r-- | include/editeng/AccessibleContextBase.hxx | 2 | ||||
-rw-r--r-- | include/editeng/AccessibleEditableTextPara.hxx | 2 |
3 files changed, 3 insertions, 10 deletions
diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx index 072110465f7a..5e0888adbf5d 100644 --- a/include/comphelper/accessiblewrapper.hxx +++ b/include/comphelper/accessiblewrapper.hxx @@ -235,7 +235,7 @@ namespace comphelper //= OAccessibleContextWrapper - typedef ::cppu::PartialWeakComponentImplHelper2< ::com::sun::star::accessibility::XAccessibleEventBroadcaster + typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::accessibility::XAccessibleEventBroadcaster , ::com::sun::star::accessibility::XAccessibleContext > OAccessibleContextWrapper_CBase; @@ -296,13 +296,6 @@ namespace comphelper // OAccessibleContextWrapper virtual void notifyTranslatedEvent( const ::com::sun::star::accessibility::AccessibleEventObject& _rEvent ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - // XComponent - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { WeakComponentImplHelperBase::removeEventListener(xListener); } - // OComponentHelper using OAccessibleContextWrapperHelper::disposing; virtual void SAL_CALL disposing() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; diff --git a/include/editeng/AccessibleContextBase.hxx b/include/editeng/AccessibleContextBase.hxx index 99ebeb8b7f01..5d2cb9c50a11 100644 --- a/include/editeng/AccessibleContextBase.hxx +++ b/include/editeng/AccessibleContextBase.hxx @@ -52,7 +52,7 @@ struct MutexOwner {mutable ::osl::Mutex maMutex;}; */ class EDITENG_DLLPUBLIC AccessibleContextBase : public MutexOwner, - public cppu::PartialWeakComponentImplHelper4< + public cppu::WeakComponentImplHelper4< ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleContext, ::com::sun::star::accessibility::XAccessibleEventBroadcaster, diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx index 6412986d6365..1b4d7c44a553 100644 --- a/include/editeng/AccessibleEditableTextPara.hxx +++ b/include/editeng/AccessibleEditableTextPara.hxx @@ -46,7 +46,7 @@ namespace accessibility { - typedef ::cppu::PartialWeakComponentImplHelper9< ::com::sun::star::accessibility::XAccessible, + typedef ::cppu::WeakComponentImplHelper9< ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleContext, ::com::sun::star::accessibility::XAccessibleComponent, ::com::sun::star::accessibility::XAccessibleEditableText, |