diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-06-07 22:34:01 +0400 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-11 15:59:08 +0100 |
| commit | e9b63535e426068435d36fbe9a70817950a55ef3 (patch) | |
| tree | a4361c9106d182f321c9b1ce3609780074352bed | |
| parent | b29d04e9360920045cfa87f1e6263434915ae9a7 (diff) | |
fdo#35972: toolbarmanager must be aware of changes in SvtMiscOptions
(cherry picked from commit 1829efaf9f5d9af9d51b01d273c7b6c60970b05d)
Conflicts:
framework/source/uielement/toolbarmanager.cxx
Change-Id: Ie6e3036e83b5ea859e2c73df47629eb79791a52c
Signed-off-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | framework/inc/uielement/toolbarmanager.hxx | 1 | ||||
| -rw-r--r-- | framework/source/uielement/addonstoolbarmanager.cxx | 3 | ||||
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 10 |
3 files changed, 14 insertions, 0 deletions
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 2f8ad0564f3b..a18d84f4c3af 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -173,6 +173,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener DECL_LINK( Deactivate, ToolBox * ); DECL_LINK( StateChanged, StateChangedType* ); DECL_LINK( DataChanged, DataChangedEvent* ); + DECL_LINK( MiscOptionsChanged, void* ); DECL_LINK( MenuButton, ToolBox * ); DECL_LINK( MenuSelect, Menu * ); diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 1ea23881c4b5..dc886e81de02 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -215,6 +215,9 @@ void AddonsToolBarManager::RefreshImages() ); } } + m_pToolBar->SetToolboxButtonSize( bBigImages ? TOOLBOX_BUTTONSIZE_LARGE : TOOLBOX_BUTTONSIZE_SMALL ); + ::Size aSize = m_pToolBar->CalcWindowSizePixel(); + m_pToolBar->SetOutputSizePixel( aSize ); } void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue > >& rAddonToolbar ) diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index df5048837489..74930d21b4f9 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -301,6 +301,8 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic m_aAsyncUpdateControllersTimer.SetTimeout( 50 ); m_aAsyncUpdateControllersTimer.SetTimeoutHdl( LINK( this, ToolBarManager, AsyncUpdateControllersHdl ) ); + + SvtMiscOptions().AddListenerLink( LINK( this, ToolBarManager, MiscOptionsChanged ) ); } ToolBarManager::~ToolBarManager() @@ -350,6 +352,8 @@ void ToolBarManager::Destroy() m_pToolBar->SetCommandHdl( aEmpty ); m_pToolBar = 0; + + SvtMiscOptions().RemoveListenerLink( LINK( this, ToolBarManager, MiscOptionsChanged ) ); } ToolBox* ToolBarManager::GetToolBar() const @@ -2139,6 +2143,12 @@ IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent ) return 1; } +IMPL_LINK(ToolBarManager, MiscOptionsChanged, void*, EMPTYARG) +{ + CheckAndUpdateImages(); + return 0; +} + IMPL_LINK( ToolBarManager, AsyncUpdateControllersHdl, Timer *, EMPTYARG ) { // The guard must be in its own context as the we can get destroyed when our |