stoc/source/javavm/javavm.cxx | 2 --
stoc/source/javavm/javavm.hxx | 4 ----
2 files changed, 6 deletions(-)
New commits:
commit 310a1931c1087f94b4b8a8f1964189e020275286
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Jun 29 17:04:53 2021 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Jun 29 21:31:24 2021 +0200
Fix JavaVirtualMachine::dispose
...which must call derived-from JavaVirtualMachine_Impl::dispose
(explicitly,
when overriding it), but which got lost with
951a9342631129832e647bd8a303a959308bad65 "use single-use attribute for
JavaVirtualMachine"
Change-Id: I0ca581ae10400f430c24a04b056afbb45a5c1445
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118121
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 47a735464040..729573b43be6 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -1472,8 +1472,6 @@ void JavaVirtualMachine::handleJniException(JNIEnv *
environment) {
}
-void JavaVirtualMachine::dispose() {}
-
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
stoc_JavaVM_get_implementation(
css::uno::XComponentContext* context , css::uno::Sequence<css::uno::Any>
const&)
diff --git a/stoc/source/javavm/javavm.hxx b/stoc/source/javavm/javavm.hxx
index 8b721bd62825..b2517fa22f69 100644
--- a/stoc/source/javavm/javavm.hxx
+++ b/stoc/source/javavm/javavm.hxx
@@ -112,10 +112,6 @@ public:
virtual void SAL_CALL
elementReplaced(css::container::ContainerEvent const & rEvent) override;
- // XComponent
- virtual void SAL_CALL
- dispose() override;
-
private:
JavaVirtualMachine(JavaVirtualMachine const &) = delete;
void operator =(const JavaVirtualMachine&) = delete;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
