stoc/source/javavm/javavm.cxx | 3 ---
1 file changed, 3 deletions(-)
New commits:
commit 8ccc28f8a72d0ac5a464418bde51ce6a1518c087
Author: Henry Castro <hcas...@collabora.com>
AuthorDate: Mon Dec 21 14:30:42 2020 +0100
Commit: Henry Castro <hcas...@collabora.com>
CommitDate: Mon Dec 21 14:35:10 2020 +0100
Revert "lok: add pre-condition "DontEnableJava""
This reverts commit 8c5c6b8993a52c40b9de231e778204bcdca16333.
Reason for revert: "This is broken. For example, "Tools - Macros - Run
Macro... - Library - LibreOffice Macros - HelloWorld" under "Macro Name" no
longer lists the JVM-based scripts ("helloworld.bsh", "helloworld.js",
"org.libreoffice.exmpale.java_scripts.HelloWorld.printHW")."
Change-Id: I6fef6ea80689f036e79816c8d58d2c1f9e64967c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108007
Tested-by: Henry Castro <hcas...@collabora.com>
Reviewed-by: Henry Castro <hcas...@collabora.com>
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index ccb8ca232813..1b7a86e712ec 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -574,9 +574,6 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8
> const & rProcessId)
if (aId != aProcessId)
return css::uno::Any();
- if (comphelper::IsContextFlagActive("DontEnableJava"))
- return css::uno::Any();
-
std::unique_ptr<JavaInfo> info;
while (!m_xVirtualMachine.is()) // retry until successful
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
