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

6 files changed, 0 insertions, 65 deletions

diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index c348f92715e9..93c494bd1503 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -994,21 +994,6 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::disposing(const css::lang::Event
 {
 }
 
-void SAL_CALL XCUBasedAcceleratorConfiguration::dispose()
-{
-    // nop
-}
-
-void SAL_CALL XCUBasedAcceleratorConfiguration::addEventListener( const css::uno::Reference< css::lang::XEventListener >& /*xListener*/ )
-{
-    // nop
-}
-
-void SAL_CALL XCUBasedAcceleratorConfiguration::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& /*xListener*/ )
-{
-    // nop
-}
-
 void XCUBasedAcceleratorConfiguration::impl_ts_load( bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& xCfg )
 {
     AcceleratorCache aReadCache = AcceleratorCache();
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
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index f6cfa4d3d74c..ea4c5f3098c4 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -83,9 +83,6 @@ public:
         return {"com.sun.star.ui.ModuleAcceleratorConfiguration"};
     }
 
-    // XComponent
-    virtual  void SAL_CALL dispose() override;
-
     /// This has to be called after when the instance is acquire()'d.
     void SAL_CALL fillCache();
 
@@ -150,22 +147,6 @@ void ModuleAcceleratorConfiguration::fillCache()
         {}
 }
 
-// XComponent.dispose(),  #i120029#, to release the cyclic reference
-
-void SAL_CALL ModuleAcceleratorConfiguration::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
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index bf141896591b..7d7cd6c7b268 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -201,7 +201,6 @@ class XMLBasedAcceleratorConfiguration : public    ::cppu::WeakImplHelper<
 
 class XCUBasedAcceleratorConfiguration : public  ::cppu::WeakImplHelper<
                                                      css::util::XChangesListener,
-                                                     css::lang::XComponent,
                                                      css::form::XReset,                    // TODO use XPresetHandler instead if available
                                                      css::ui::XAcceleratorConfiguration >  // => css::ui::XUIConfigurationPersistence
                                                                                            //    css::ui::XUIConfigurationStorage
@@ -287,11 +286,6 @@ class XCUBasedAcceleratorConfiguration : public  ::cppu::WeakImplHelper<
         // css.lang.XEventListener
         virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
 
-        // XComponent
-        virtual  void SAL_CALL dispose() override;
-        virtual  void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
-        virtual  void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
-
         // helper for derived classes
 
     protected:
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 3543f2e7f2fa..995034248b9d 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -940,9 +940,6 @@ void SAL_CALL ModuleUIConfigurationManager::dispose()
     SolarMutexClearableGuard aGuard;
     Reference< XComponent > xModuleImageManager( m_xModuleImageManager );
     m_xModuleImageManager.clear();
-    Reference< XComponent > xCompMAM( m_xModuleAcceleratorManager, UNO_QUERY );
-    if ( xCompMAM.is() )
-        xCompMAM->dispose();
     m_xModuleAcceleratorManager.clear();
     m_aUIElements[LAYER_USERDEFINED].clear();
     m_aUIElements[LAYER_DEFAULT].clear();
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 1f9c9687f05e..6e3cc8d87a0c 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -296,9 +296,6 @@ void SAL_CALL MenuBarManager::dispose()
         }
         m_xDocImageManager.clear();
         m_xModuleImageManager.clear();
-        Reference< XComponent > xCompGAM( m_xGlobalAcceleratorManager, UNO_QUERY );
-        if ( xCompGAM.is() )
-            xCompGAM->dispose();
         m_xGlobalAcceleratorManager.clear();
         m_xModuleAcceleratorManager.clear();
         m_xDocAcceleratorManager.clear();