From 09f80aded680fca07e6676f769b80491da12f0bb Mon Sep 17 00:00:00 2001
From: Mike Kaganski <mike.kaganski@collabora.com>
Date: Thu, 20 Dec 2018 07:55:20 +0100
Subject: Restore original behavior of MasterScriptProvider::hasByName

Commit f3ce30ec75a4d7116b9cd4d7b21d9aaa0e237eeb changed this to return
after first non-throwing XNameContainer::hasByName, regardless if it
returned true or false.

This changes it back, to iterate over all the providers again.

Change-Id: I74fa4d4aa8760cad509442226601ab4842312b80
Reviewed-on: https://gerrit.libreoffice.org/65471
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
---
 scripting/source/provider/MasterScriptProvider.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'scripting/source')

diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index 6854d6283dc0..4a66a15093da 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -466,7 +466,8 @@ template <typename Proc> bool FindProviderAndApply(ProviderCache& rCache, Proc p
             try
             {
                 bResult = p(xCont);
-                break;
+                if (bResult)
+                    break;
             }
             catch (Exception& e)
             {
-- 
cgit