From 44b1352c540a97b1cb25abcd46cd9ec387288841 Mon Sep 17 00:00:00 2001
From: Jan Holesovsky <kendy@suse.cz>
Date: Tue, 9 Apr 2013 21:27:10 +0200
Subject: Nobody needs pointer to ToolBarManager.

Change-Id: I74624b1b28d948e2299014499a1eef309488ad13
---
 framework/inc/uielement/toolbar.hxx                 | 5 -----
 framework/source/uielement/addonstoolbarwrapper.cxx | 1 -
 framework/source/uielement/toolbar.cxx              | 6 ------
 framework/source/uielement/toolbarwrapper.cxx       | 1 -
 4 files changed, 13 deletions(-)

(limited to 'framework')

diff --git a/framework/inc/uielement/toolbar.hxx b/framework/inc/uielement/toolbar.hxx
index 7d67f010c891..b7ac587ae595 100644
--- a/framework/inc/uielement/toolbar.hxx
+++ b/framework/inc/uielement/toolbar.hxx
@@ -36,10 +36,6 @@ class ToolBar : public ToolBox
         virtual void    StateChanged( StateChangedType nType );
         virtual void    DataChanged( const DataChangedEvent& rDCEvt );
 
-        // Toolbar manager
-        void            SetToolBarManager( ToolBarManager* pTbMgr );
-        ToolBarManager* GetToolBarManager() const { return m_pToolBarManager; }
-
         // Provide additional handlers to support external implementations
         void            SetCommandHdl( const Link& aLink ) { m_aCommandHandler = aLink; }
         const Link&     GetCommandHdl() const { return m_aCommandHandler; }
@@ -52,7 +48,6 @@ class ToolBar : public ToolBox
         Link            m_aCommandHandler;
         Link            m_aStateChangedHandler;
         Link            m_aDataChangedHandler;
-        ToolBarManager* m_pToolBarManager;
 };
 
 }
diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx
index a3617ee19a24..75a9fb2a0e82 100644
--- a/framework/source/uielement/addonstoolbarwrapper.cxx
+++ b/framework/source/uielement/addonstoolbarwrapper.cxx
@@ -119,7 +119,6 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument
 
                     pToolBar = new ToolBar( pWindow, nStyles );
                     pToolBarManager = new AddonsToolBarManager( comphelper::getComponentContext(m_xServiceManager), xFrame, m_aResourceURL, pToolBar );
-                    pToolBar->SetToolBarManager( pToolBarManager );
                     m_xToolBarManager = Reference< XComponent >( static_cast< OWeakObject *>( pToolBarManager ), UNO_QUERY );
                 }
             }
diff --git a/framework/source/uielement/toolbar.cxx b/framework/source/uielement/toolbar.cxx
index d1e5ddab4126..4e71b6a3e166 100644
--- a/framework/source/uielement/toolbar.cxx
+++ b/framework/source/uielement/toolbar.cxx
@@ -26,7 +26,6 @@ namespace framework
 
 ToolBar::ToolBar( Window* pParent, WinBits nWinBits ) :
     ToolBox( pParent, nWinBits )
-    ,   m_pToolBarManager( 0 )
 {
 }
 
@@ -34,11 +33,6 @@ ToolBar::~ToolBar()
 {
 }
 
-void ToolBar::SetToolBarManager( ToolBarManager* pTbMgr )
-{
-    m_pToolBarManager = pTbMgr;
-}
-
 void ToolBar::Command( const CommandEvent& rCEvt )
 {
     if ( m_aCommandHandler.IsSet() )
diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx
index 20cf3db07e44..2dbaa1d7e44a 100644
--- a/framework/source/uielement/toolbarwrapper.cxx
+++ b/framework/source/uielement/toolbarwrapper.cxx
@@ -155,7 +155,6 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th
 
                     pToolBar = new ToolBar( pWindow, nStyles );
                     pToolBarManager = new ToolBarManager( comphelper::getComponentContext(m_xServiceFactory), xFrame, m_aResourceURL, pToolBar );
-                    pToolBar->SetToolBarManager( pToolBarManager );
                     m_xToolBarManager = Reference< XComponent >( static_cast< OWeakObject *>( pToolBarManager ), UNO_QUERY );
                     pToolBar->WillUsePopupMode( bPopupMode );
                 }
-- 
cgit