diff options
| author | Andre Fischer <af@apache.org> | 2012-06-20 11:58:32 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-11 18:53:28 +0100 |
| commit | 11f8e53d6c9942185702552445a751c6f542942d (patch) | |
| tree | 5caab2fb87553099d0b5e100af6f5c9a32cf15a0 /framework/source/inc | |
| parent | 4bdbf360360bcc39929a18a4226a6ad1a22d8630 (diff) | |
Resolves: #i120029# Unregister on dispose.
Patch by: zhang jianfang
Review by: Andre Fischer
(cherry picked from commit e0d5abb649958e48660357d3fa37ab6e9707b61f)
Conflicts:
framework/source/uielement/toolbarmanager.cxx
Change-Id: I4c6a112b27396fc7e5d42f3feef11ac1fe81efcd
Diffstat (limited to 'framework/source/inc')
3 files changed, 12 insertions, 0 deletions
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index 2d71deb8d92e..f4e77e5841b9 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -290,6 +290,7 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase , public ::cppu::OWeakObject , public css::lang::XTypeProvider , public css::util::XChangesListener + , public css::lang::XComponent , public css::form::XReset // TODO use XPresetHandler instead if available , public css::ui::XAcceleratorConfiguration // => css::ui::XUIConfigurationPersistence // css::ui::XUIConfigurationStorage @@ -416,6 +417,11 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException); + // XComponent + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + //______________________________________ // helper for derived classes diff --git a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx index 1068a4c53987..2d0e33016ebe 100644 --- a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx @@ -70,6 +70,9 @@ class GlobalAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration throw (css::uno::Exception , css::uno::RuntimeException); + // XComponent + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); + //______________________________________ // helper diff --git a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx index bd7838fdc3be..8ff1c9426452 100644 --- a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx @@ -81,6 +81,9 @@ class ModuleAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration throw(css::uno::Exception , css::uno::RuntimeException); + // XComponent + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); + //______________________________________ // helper |