diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-12-20 07:55:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-12-20 14:09:36 +0100 |
| commit | 8c94b3c82cb80a1f3cae29f0b841ea9c9eea5e7b (patch) | |
| tree | fd4c10c8e2f605d411ab53e70723a8795b78b1cf /scripting | |
| parent | f5d7049f4eb39967625bac819e17170485ea6698 (diff) | |
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>
(cherry picked from commit 09f80aded680fca07e6676f769b80491da12f0bb)
Reviewed-on: https://gerrit.libreoffice.org/65473
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/source/provider/MasterScriptProvider.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
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) { |