diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-10-13 21:23:08 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-10-13 21:53:06 +0200 |
commit | 1a848fb9b55eb1748ef902c8ec71a6576294aed5 (patch) | |
tree | c48ac55421c6cb39987e67645f7c0169a3c40663 /framework | |
parent | 0cd2250b7c3e0cfed297590f0cb07dab4c8df1d4 (diff) |
Don't add experimental commands to the Toolbar
Change-Id: I1c1eb33f938bf8d6acac13dfe0a2119a4967e2a1
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 7942d9429ce7..76e4d154be26 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1025,6 +1025,12 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine aProp[i].Value >>= nStyle; } + if (vcl::CommandInfoProvider::Instance().IsExperimental(aCommandURL, m_aModuleIdentifier) && + !SvtMiscOptions().IsExperimentalMode()) + { + continue; + } + if (( nType == css::ui::ItemType::DEFAULT ) && !aCommandURL.isEmpty() ) { OUString aString(vcl::CommandInfoProvider::Instance().GetLabelForCommand(aCommandURL, m_xFrame)); |