diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-11-09 15:12:52 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-11-09 17:02:36 +0100 |
| commit | ebccc375248faebdfbca273b149483593c753387 (patch) | |
| tree | e7c804cdf9a5c25b9cd59b31614cd2860cac7b87 /cui | |
| parent | 9336ae40d51e9a95ea31dd5fcfa5b67a9b2bafd7 (diff) | |
tdf#128010: Don't ask to enable JRE when populating available scripts
It was user's intention to not use JRE, so omitting the JRE-dependent
scripts in dialogs is just consistent with user's configuration.
Change-Id: Ic551f5dd1d797fbaa2dc6d7e443e23d46b0ac5d3
Reviewed-on: https://gerrit.libreoffice.org/82353
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/customize/CommandCategoryListBox.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/cui/source/customize/CommandCategoryListBox.cxx b/cui/source/customize/CommandCategoryListBox.cxx index a5c572e6a935..10758d0af47a 100644 --- a/cui/source/customize/CommandCategoryListBox.cxx +++ b/cui/source/customize/CommandCategoryListBox.cxx @@ -42,6 +42,7 @@ #include <strings.hrc> #include <comphelper/processfactory.hxx> #include <comphelper/sequenceashashmap.hxx> +#include <comphelper/SetFlagContextHelper.hxx> #include <comphelper/string.hxx> #include <i18nlangtag/languagetag.hxx> #include <i18nutil/searchopt.hxx> @@ -381,8 +382,15 @@ void CommandCategoryListBox::categorySelected(CuiConfigFunctionListBox* pFunctio SfxCfgKind::GROUP_SCRIPTCONTAINER, 0 ) ); std::unique_ptr<weld::TreeIter> xMacroGroup(pFunctionListBox->tree_append(OUString::number(reinterpret_cast<sal_Int64>(m_aGroupInfo.back().get())), sUIName)); - //Add the children and the grand children - addChildren(xMacroGroup.get(), childGroup, pFunctionListBox, filterTerm, pCurrentSaveInData, aNodesToExpand); + { + // tdf#128010: Do not nag user asking to enable JRE: if it's disabled, + // simply don't show relevant entries (user chose to not use JRE) + css::uno::ContextLayer layer( + comphelper::NoEnableJavaInteractionContext()); + //Add the children and the grand children + addChildren(xMacroGroup.get(), childGroup, pFunctionListBox, filterTerm, + pCurrentSaveInData, aNodesToExpand); + } // Remove the main group if empty if (!pFunctionListBox->iter_has_child(*xMacroGroup)) |