svtools/source/java/javacontext.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 5e4b082001471526dbca937d859b17d8121b7601
Author: Henry Castro <hcas...@collabora.com>
AuthorDate: Mon Dec 28 14:08:41 2020 -0400
Commit: Henry Castro <hcas...@collabora.com>
CommitDate: Tue Jan 19 12:38:23 2021 +0100
lok: disable java interaction handler
Unfortunately, when the client side shows
the "Macro Selector" dialog, it tries to show
a java interaction message box to locate the
files of the JVM, even if the code explicitly
option to not enable "DontEnableJava"
Change-Id: I2ef4373f58c3ba23a5b86c5dc984caf6c10821ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108421
Tested-by: Jenkins
Reviewed-by: Henry Castro <hcas...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109148
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git a/svtools/source/java/javacontext.cxx
b/svtools/source/java/javacontext.cxx
index f961453f6e7e..c804e5f0b99e 100644
--- a/svtools/source/java/javacontext.cxx
+++ b/svtools/source/java/javacontext.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <comphelper/lok.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Type.hxx>
#include <svtools/javacontext.hxx>
@@ -63,6 +64,7 @@ Any SAL_CALL JavaContext::getValueByName( const OUString&
Name)
if ( Name == JAVA_INTERACTION_HANDLER_NAME )
{
+ if ( !comphelper::LibreOfficeKit::isActive() )
{
osl::MutexGuard aGuard(osl::Mutex::getGlobalMutex());
if (!m_xHandler.is())
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
