diff options
author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-02-19 09:48:33 +0200 |
---|---|---|
committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-02-21 01:39:53 +0200 |
commit | 7e559e549528686d431056bd1bbbc9c0a0bfb304 (patch) | |
tree | a61008ce25e1740da8ee791414023a6f3e1a5fff /framework/source/accelerators/globalacceleratorconfiguration.cxx | |
parent | 096637c9570654437e9f5e12a614fdcefc23ae3a (diff) |
Revert "Resolves: #i120029# Unregister on dispose."
This reverts commit 11f8e53d6c9942185702552445a751c6f542942d.
At the time this commit was imported from AOO, we had the
original problem fixed already with
dd8fa7c25af9614dbee5a7795b95d8583093f65b ("fix more lifecycle
problems").
Change-Id: Id8288d30c1cb908b68e5b9ef0279237412aae357
Diffstat (limited to 'framework/source/accelerators/globalacceleratorconfiguration.cxx')
-rw-r--r-- | framework/source/accelerators/globalacceleratorconfiguration.cxx | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx index 5648c917653c..ba5a2e407b8e 100644 --- a/framework/source/accelerators/globalacceleratorconfiguration.cxx +++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx @@ -69,9 +69,6 @@ public: return {"com.sun.star.ui.GlobalAcceleratorConfiguration"}; } - // XComponent - virtual void SAL_CALL dispose() override; - /// This has to be called after when the instance is acquire()'d. void fillCache(); @@ -114,22 +111,6 @@ void GlobalAcceleratorConfiguration::fillCache() {} } -// XComponent.dispose(), #i120029#, to release the cyclic reference - -void SAL_CALL GlobalAcceleratorConfiguration::dispose() -{ - try - { - css::uno::Reference< css::util::XChangesNotifier > xBroadcaster(m_xCfg, css::uno::UNO_QUERY_THROW); - if ( xBroadcaster.is() ) - xBroadcaster->removeChangesListener(static_cast< css::util::XChangesListener* >(this)); - } - catch(const css::uno::RuntimeException&) - { throw; } - catch(const css::uno::Exception&) - {} -} - } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL |