From 8e9a7cac42d554402a6ead3a83ae8b7defc9247b Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 10 Mar 2016 19:21:15 +0100 Subject: No more need for jfw_freeJavaInfo Change-Id: I2426a76936b4099a243ce8c102da867e7868aac3 --- stoc/source/javavm/javavm.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'stoc') diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 78ac585a8b7b..ab72925cbefb 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -662,10 +662,10 @@ namespace { struct JavaInfoGuard: private boost::noncopyable { JavaInfoGuard(): info(nullptr) {} - ~JavaInfoGuard() { jfw_freeJavaInfo(info); } + ~JavaInfoGuard() { delete info; } void clear() { - jfw_freeJavaInfo(info); + delete info; info = nullptr; } @@ -836,7 +836,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) } } - jfw_freeJavaInfo(pJavaInfo); + delete pJavaInfo; //Error: %PRODUCTNAME requires a Java //runtime environment (JRE) to perform this task. The selected JRE -- cgit