mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "lok: add pre-condition "DontEnableJava""

Browse Source 
This reverts commit 8c5c6b8993.

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 <hcastro@collabora.com>
Reviewed-by: Henry Castro <hcastro@collabora.com>
This commit is contained in:
Henry Castro
2020-12-21 14:30:42 +01:00
parent d7dfae2143
commit 8ccc28f8a7
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
stoc/source/javavm/javavm.cxx
View File

@@ -574,9 +574,6 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId)
if (aId != aProcessId) if (aId != aProcessId)
return css::uno::Any(); return css::uno::Any();
if (comphelper::IsContextFlagActive("DontEnableJava"))
return css::uno::Any();
std::unique_ptr<JavaInfo> info; std::unique_ptr<JavaInfo> info;
while (!m_xVirtualMachine.is()) // retry until successful while (!m_xVirtualMachine.is()) // retry until successful
{ {