diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-13 12:07:35 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-13 12:07:35 +0000 |
| commit | d881d733084def5d75a3e69de3dbe0254fe1f41b (patch) | |
| tree | e6b49ccabe8df6c6bd24ab9cdeaf9f29a6470eaf /sfx2/source/toolbox/tbxitem.cxx | |
| parent | a69c60b8025ce9d571f8408c43d28c5d335f04fc (diff) | |
INTEGRATION: CWS fwk86 (1.67.216); FILE MERGED
2008/04/30 15:47:44 pb 1.67.216.2: RESYNC: (1.67-1.68); FILE MERGED
2008/04/07 11:49:07 pb 1.67.216.1: fix: #i86924# reset item images if symbols style has changed
Diffstat (limited to 'sfx2/source/toolbox/tbxitem.cxx')
| -rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 3012d7a6e7..089fbc4118 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tbxitem.cxx,v $ - * $Revision: 1.68 $ + * $Revision: 1.69 $ * * This file is part of OpenOffice.org. * @@ -1436,8 +1436,8 @@ SfxPopupWindow* SfxPopupWindow::Clone() const //-------------------------------------------------------------------- -void SfxPopupWindow::StateChanged( - USHORT /*nSID*/, +void SfxPopupWindow::StateChanged( + USHORT /*nSID*/, SfxItemState eState, const SfxPoolItem* /*pState*/ ) /* [Bescheibung] @@ -1485,6 +1485,7 @@ SfxAppToolBoxControl_Impl::SfxAppToolBoxControl_Impl( USHORT nSlotId, USHORT nId // Determine the current background color of the menus const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); + m_nSymbolsStyle = rSettings.GetSymbolsStyle(); m_bWasHiContrastMode = rSettings.GetMenuColor().IsDark(); m_bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled(); @@ -1760,12 +1761,15 @@ IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu ) if ( pActMenu ) { const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - BOOL bIsHiContrastMode = rSettings.GetMenuColor().IsDark(); + ULONG nSymbolsStyle = rSettings.GetSymbolsStyle(); + BOOL bIsHiContrastMode = rSettings.GetMenuColor().IsDark(); BOOL bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled(); - if (( bIsHiContrastMode != m_bWasHiContrastMode ) || - ( bShowMenuImages != m_bShowMenuImages ) ) + if (( nSymbolsStyle != m_nSymbolsStyle ) || + ( bIsHiContrastMode != m_bWasHiContrastMode ) || + ( bShowMenuImages != m_bShowMenuImages )) { + m_nSymbolsStyle = nSymbolsStyle; m_bWasHiContrastMode = bIsHiContrastMode; m_bShowMenuImages = bShowMenuImages; |