diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-13 12:06:16 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-13 12:06:16 +0000 |
| commit | a69c60b8025ce9d571f8408c43d28c5d335f04fc (patch) | |
| tree | 0eaa17b0c5a7b60f23dc88a2b0d23668c0624562 /sfx2 | |
| parent | a32c63a1960cac1ac282d37b3077cf52f57c65a8 (diff) | |
INTEGRATION: CWS fwk86 (1.21.82); FILE MERGED
2008/04/30 15:47:39 pb 1.21.82.2: RESYNC: (1.21-1.23); FILE MERGED
2008/04/07 11:47:44 pb 1.21.82.1: fix: #i86924# reset item images if symbols style has changed
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/menu/mnuitem.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index 329cd5a5c2..03702e6c8c 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: mnuitem.cxx,v $ - * $Revision: 1.23 $ + * $Revision: 1.24 $ * * This file is part of OpenOffice.org. * @@ -444,8 +444,8 @@ SfxAppMenuControl_Impl::SfxAppMenuControl_Impl( // Determine the current background color setting for menus const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - BOOL bIsHiContrastMode = rSettings.GetMenuColor().IsDark(); - m_bWasHiContrastMode = bIsHiContrastMode; + m_nSymbolsStyle = rSettings.GetSymbolsStyle(); + m_bWasHiContrastMode = rSettings.GetMenuColor().IsDark(); m_bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled(); Reference<com::sun::star::lang::XMultiServiceFactory> aXMultiServiceFactory(::comphelper::getProcessServiceFactory()); @@ -469,13 +469,16 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu ) { if ( pActMenu ) { - BOOL bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled(); const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); + 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; |