From 897d7314429d2a7aa5ba25111dc454a159bd8e5e Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 7 Dec 2018 23:27:51 +0100 Subject: reduce the amount of senseless exceptions during document load Change-Id: If9d0a0539002c013f077b8fb692de4c29ca032b7 Reviewed-on: https://gerrit.libreoffice.org/64791 Tested-by: Jenkins Reviewed-by: Markus Mohrhard --- framework/source/uielement/menubarmanager.cxx | 2 +- framework/source/uielement/toolbarmanager.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'framework/source/uielement') 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; -- cgit