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

[Libreoffice Gerrit user]

 framework/source/uielement/menubarmanager.cxx |    2 +-
 framework/source/uielement/toolbarmanager.cxx |    2 +-
 vcl/source/helper/commandinfoprovider.cxx     |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 897d7314429d2a7aa5ba25111dc454a159bd8e5e
Author:     Markus Mohrhard <markus.mohrhard at googlemail.com>
AuthorDate: Fri Dec 7 23:27:51 2018 +0100
Commit:     Markus Mohrhard <markus.mohrhard at googlemail.com>
CommitDate: Sat Dec 8 01:21:09 2018 +0100

    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 <markus.mohrhard at googlemail.com>

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