summaryrefslogtreecommitdiff
path: root/framework/source
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2013-04-09 21:27:10 +0200
committerJan Holesovsky <kendy@suse.cz>2013-04-10 10:39:53 +0200
commit44b1352c540a97b1cb25abcd46cd9ec387288841 (patch)
tree2859a56df91587b012e3f30fc40a512180d6c052 /framework/source
parent4be242ce6b91dd23ffa8075bb4eeb05e8bb3d01c (diff)
Nobody needs pointer to ToolBarManager.
Change-Id: I74624b1b28d948e2299014499a1eef309488ad13
Diffstat (limited to 'framework/source')
-rw-r--r--framework/source/uielement/addonstoolbarwrapper.cxx1
-rw-r--r--framework/source/uielement/toolbar.cxx6
-rw-r--r--framework/source/uielement/toolbarwrapper.cxx1
3 files changed, 0 insertions, 8 deletions
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 );
}