diff options
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/helper/commandinfoprovider.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 022f5d766c5d..530977a590f1 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1453,7 +1453,7 @@ void MenuBarManager::FillMenu( aProp[i].Value >>= bEnabled; } - if (vcl::CommandInfoProvider::IsExperimental(aCommandURL, rModuleIdentifier) && + if (!aCommandURL.isEmpty() && vcl::CommandInfoProvider::IsExperimental(aCommandURL, rModuleIdentifier) && !SvtMiscOptions().IsExperimentalMode()) { continue; diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 1ee4797d889b..29ccca57f239 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1009,7 +1009,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine aProp[i].Value >>= nStyle; } - if (vcl::CommandInfoProvider::IsExperimental(aCommandURL, m_aModuleIdentifier) && + if (!aCommandURL.isEmpty() && vcl::CommandInfoProvider::IsExperimental(aCommandURL, m_aModuleIdentifier) && !SvtMiscOptions().IsExperimentalMode()) { continue; diff --git a/vcl/source/helper/commandinfoprovider.cxx b/vcl/source/helper/commandinfoprovider.cxx index ee9196c6411e..23bd3250f888 100644 --- a/vcl/source/helper/commandinfoprovider.cxx +++ b/vcl/source/helper/commandinfoprovider.cxx @@ -194,7 +194,7 @@ static Sequence<beans::PropertyValue> GetCommandProperties(const OUString& rsCom { Reference<container::XNameAccess> xNameAccess(GetCommandDescription()); Reference<container::XNameAccess> xUICommandLabels; - if (xNameAccess->getByName(rsModuleName) >>= xUICommandLabels) + if ((xNameAccess->getByName(rsModuleName) >>= xUICommandLabels) && xUICommandLabels->hasByName(rsCommandName)) xUICommandLabels->getByName(rsCommandName) >>= aProperties; } } |