[Libreoffice-commits] core.git: framework/source

[Roman Kuznetsov (via logerrit)]

 framework/source/uielement/toolbarmodemenucontroller.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit aaad28f8873e8ffa92f4e1340707f45b2737f20e
Author:     Roman Kuznetsov <antilibreoffice at gmail.com>
AuthorDate: Sat Jan 11 20:03:15 2020 +0100
Commit:     Roman Kuznetsov <antilibreoffice at gmail.com>
CommitDate: Wed Jan 15 07:28:00 2020 +0100

    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 at collabora.com>
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>
    Reviewed-by: Roman Kuznetsov <antilibreoffice at gmail.com>

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 );