From ac20f98e498439b188a69e590336fc7cd6866b38 Mon Sep 17 00:00:00 2001 From: Samuel Mehrbrodt Date: Thu, 13 Oct 2016 21:45:26 +0200 Subject: Don't add experimental commands to the Menu Change-Id: I76b1c745d4c4d99f3a0a8d7573f1beae99503ef9 --- framework/source/uielement/menubarmanager.cxx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index feb5e71befcd..77e484d532ee 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1653,6 +1653,12 @@ void MenuBarManager::FillMenu( aProp[i].Value >>= bEnabled; } + if (vcl::CommandInfoProvider::Instance().IsExperimental(aCommandURL, rModuleIdentifier) && + !SvtMiscOptions().IsExperimentalMode()) + { + continue; + } + if ( nType == css::ui::ItemType::DEFAULT ) { pMenu->InsertItem( nId, aLabel ); -- cgit