diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-10-06 17:08:57 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-10-08 16:12:20 +0200 |
commit | f3ce30ec75a4d7116b9cd4d7b21d9aaa0e237eeb (patch) | |
tree | 63796907e0ec423d41d06fc15e9ceba0da567624 /include | |
parent | 078a81d5ba9f44b642e3e8b838fc4fe48a91810a (diff) |
tdf#120363: try to avoid asking user to enable JVM when looking ...
... for a provider for an operation.
When another provider actually handles an operation, it's useless to
ask user to enable disabled JVM just to learn that it doesn't handle
the request. So, this patch does the MasterScriptProvider operations
in two steps: first with "Enable JVM" interaction disabled, and if
failed, again with the interaction enabled to try disabled providers.
This shouldn't typically give performance penalties in case when JVM
is enabled, and when it's disabled and the operation is addressed to
another provider.
A context class designed to disable "Enable JVM" interaction is moved
from cui/source/customize/cfgutil.cxx to a new comphelper header,
which is supposed to hold similar helper context classes in needed.
Change-Id: I21be922bfd80a276d9c8f1215d62a47bb3c225f5
Reviewed-on: https://gerrit.libreoffice.org/61468
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/comphelper/DisableInteractionHelper.hxx | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/include/comphelper/DisableInteractionHelper.hxx b/include/comphelper/DisableInteractionHelper.hxx new file mode 100644 index 000000000000..7d99112edeaa --- /dev/null +++ b/include/comphelper/DisableInteractionHelper.hxx @@ -0,0 +1,49 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_COMPHELPER_DISABLEINTERACTIONHELPER_HXX +#define INCLUDED_COMPHELPER_DISABLEINTERACTIONHELPER_HXX + +#include <cppuhelper/implbase.hxx> +#include <uno/current_context.hxx> + +namespace comphelper +{ +class NoEnableJavaInteractionContext : public cppu::WeakImplHelper<css::uno::XCurrentContext> +{ +public: + explicit NoEnableJavaInteractionContext( + css::uno::Reference<css::uno::XCurrentContext> const& xContext) + : mxContext(xContext) + { + } + NoEnableJavaInteractionContext(const NoEnableJavaInteractionContext&) = delete; + NoEnableJavaInteractionContext& operator=(const NoEnableJavaInteractionContext&) = delete; + +private: + virtual ~NoEnableJavaInteractionContext() override {} + + virtual css::uno::Any SAL_CALL getValueByName(rtl::OUString const& Name) override + { + if (Name == "DontEnableJava") + return css::uno::Any(true); + else if (mxContext.is()) + return mxContext->getValueByName(Name); + else + return css::uno::Any(); + } + + css::uno::Reference<css::uno::XCurrentContext> mxContext; +}; + +} // namespace comphelper + +#endif // INCLUDED_COMPHELPER_DISABLEINTERACTIONHELPER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |