diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-06-03 23:32:48 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-05 10:14:46 +0100 |
| commit | 76f02c23ffff5dd442c78994eda1e6853cfe7e55 (patch) | |
| tree | 4e8149d6c161f586e0e84a57fc8e7f0df1fe91a1 /framework/source | |
| parent | e7e6d0f72b5388db3d0db17befb6fc0a00fa13c4 (diff) | |
assume for all menus we reserve space for checkboxes
so menus have consistent whitespace at left regardless of containing
checkboxes/radiobutton entries. Its nasty to have menus "suddenly"
appear without whitespace as submenus of ones with whitespace.
This is a logical consequence of MENU_FLAG_SHOWCHECKIMAGES always
set (in the absence of SetMenuFlags where usage has generally
dropped MENU_FLAG_SHOWCHECKIMAGES accidentally)
Change-Id: I9501381b91415131eff5143a0c88142221530fb6
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index d24da8c2b673..4c64446bfd8a 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -831,7 +831,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) nFlag &= ~MENU_FLAG_HIDEDISABLEDENTRIES; else nFlag |= MENU_FLAG_HIDEDISABLEDENTRIES; - pMenu->SetMenuFlags( nFlag | MENU_FLAG_SHOWCHECKIMAGES ); + pMenu->SetMenuFlags( nFlag ); if ( m_bActive ) return 0; diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index f30f07ec80fe..63e24f7fb6b8 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1780,9 +1780,6 @@ PopupMenu * ToolBarManager::GetToolBarCustomMenu(ToolBox* pToolBar) if( !(pToolBar->GetFloatStyle() & WB_CLOSEABLE) ) aPopupMenu.EnableItem(MENUITEM_TOOLBAR_CLOSE, sal_False); - pItemMenu->SetMenuFlags (pItemMenu->GetMenuFlags () | - MENU_FLAG_SHOWCHECKIMAGES); - for ( nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos ) { if ( m_pToolBar->GetItemType(nPos) == TOOLBOXITEM_BUTTON ) @@ -1827,9 +1824,6 @@ PopupMenu * ToolBarManager::GetToolBarCustomMenu(ToolBox* pToolBar) // create an own submenu to avoid auto-delete when resource menu is deleted PopupMenu *pItemMenu = new PopupMenu(); - pItemMenu->SetMenuFlags (pItemMenu->GetMenuFlags () | - MENU_FLAG_SHOWCHECKIMAGES); - for( i=0; i< aPopupMenu.GetPopupMenu( 1 )->GetItemCount(); i++) pItemMenu->CopyItem( *aPopupMenu.GetPopupMenu( 1 ), i, MENU_APPEND ); |