diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2013-04-10 10:37:48 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2013-04-10 10:39:54 +0200 |
| commit | 5d67919a5810cf05d6fe53dc14f2b1f073c56719 (patch) | |
| tree | 3fbb79de1d0a547e5d720df47903e52e264e1b84 /framework/source/uielement/toolbarmanager.cxx | |
| parent | 99d851b3e2b9f41a6616813cbf7a681aa842615e (diff) | |
Kill the ToolBar class, move the needed bits directly to ToolBox.
Change-Id: I6aaa396931ce613be64026b53372dc24c6189724
Diffstat (limited to 'framework/source/uielement/toolbarmanager.cxx')
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 85de30c0542d..ae5fafbb8b9c 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -19,7 +19,6 @@ #include <uielement/toolbarmanager.hxx> -#include <uielement/toolbar.hxx> #include <uielement/generictoolbarcontroller.hxx> #include <threadhelp/resetableguard.hxx> #include "services.h" @@ -68,6 +67,7 @@ #include <vcl/menu.hxx> #include <vcl/syswin.hxx> #include <vcl/taskpanelist.hxx> +#include <vcl/toolbox.hxx> #include <rtl/logfile.hxx> #include <svtools/menuoptions.hxx> #include <boost/bind.hpp> @@ -201,7 +201,7 @@ DEFINE_XTYPEPROVIDER_6 ( ToolBarManager ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rFrame, const OUString& rResourceName, - ToolBar* pToolBar ) : + ToolBox* pToolBar ) : ThreadHelpBase( &Application::GetSolarMutex() ), OWeakObject(), m_bDisposed( false ), @@ -751,7 +751,7 @@ void ToolBarManager::setToolBarImage(const Image& _aImage,const CommandToInfoMap { const ::std::vector< sal_uInt16 >& _rIDs = _pIter->second.aIds; m_pToolBar->SetItemImage( _pIter->second.nId, _aImage ); - ::std::for_each(_rIDs.begin(),_rIDs.end(),::boost::bind(&ToolBar::SetItemImage,m_pToolBar,_1,_aImage)); + ::std::for_each(_rIDs.begin(),_rIDs.end(),::boost::bind(&ToolBox::SetItemImage,m_pToolBar,_1,_aImage)); } void SAL_CALL ToolBarManager::elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException) |