diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-10 19:21:15 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-10 21:42:31 +0100 |
| commit | 8e9a7cac42d554402a6ead3a83ae8b7defc9247b (patch) | |
| tree | 9905516c3e7ca3cc6de020e8cc36d84adb650a29 /stoc/source/javavm/javavm.cxx | |
| parent | 8546831b3b36e29c1ee42b790cbecd3fd8d8bbaf (diff) | |
No more need for jfw_freeJavaInfo
Change-Id: I2426a76936b4099a243ce8c102da867e7868aac3
Diffstat (limited to 'stoc/source/javavm/javavm.cxx')
| -rw-r--r-- | stoc/source/javavm/javavm.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
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 |