diff options
author | Roman Kuznetsov <antilibreoffice@gmail.com> | 2020-01-11 20:03:15 +0100 |
---|---|---|
committer | Roman Kuznetsov <antilibreoffice@gmail.com> | 2020-01-15 07:28:00 +0100 |
commit | aaad28f8873e8ffa92f4e1340707f45b2737f20e (patch) | |
tree | e2b5cd4abc9b589fa94b694cbf0a317dda551578 /framework | |
parent | 4b40797585c5f68e2266586d33db4c4b6af498d5 (diff) |
tdf#125089 Fix shoowing a separator in View-User interfaces submenus
for non EN GUI
Change-Id: I8761560e48f781ed516494984fc5a86c72019ad0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86619
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Roman Kuznetsov <antilibreoffice@gmail.com>
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/uielement/toolbarmodemenucontroller.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/framework/source/uielement/toolbarmodemenucontroller.cxx b/framework/source/uielement/toolbarmodemenucontroller.cxx index 218f50c7e7a3..15596a091335 100644 --- a/framework/source/uielement/toolbarmodemenucontroller.cxx +++ b/framework/source/uielement/toolbarmodemenucontroller.cxx @@ -130,11 +130,12 @@ void ToolbarModeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > OUString aCommandArg = comphelper::getString( aModeNode.getNodeValue( "CommandArg" ) ); long nPosition = comphelper::getINT32( aModeNode.getNodeValue( "MenuPosition" ) ); bool isExperimental = comphelper::getBOOL( aModeNode.getNodeValue( "IsExperimental" ) ); + bool hasNotebookbar = comphelper::getBOOL( aModeNode.getNodeValue( "HasNotebookbar" ) ); // Allow Notebookbar only in experimental mode if ( isExperimental && !aMiscOptions.IsExperimentalMode() ) continue; - if(aLabel == "Sidebar" || aLabel == "Standard Toolbar" || aLabel == "Single Toolbar") + if (!hasNotebookbar) nCountToolbar++; m_xPopupMenu->insertItem( nReadIndex+1, aLabel, css::awt::MenuItemStyle::RADIOCHECK, nPosition ); |