stoc/source/javavm/javavm.cxx | 2 +-
stoc/source/javavm/javavm.hxx | 15 ++++-----------
2 files changed, 5 insertions(+), 12 deletions(-)
New commits:
commit 457d53b1d409f97545a9d6492efa5119de92293c
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Jun 29 16:12:00 2021 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Jun 29 21:31:47 2021 +0200
Drop old MSVC workaround
Change-Id: Ifbbbad0bf837533d36fdeddcb0184baa5b789ca3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118118
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 729573b43be6..00fec7970aa6 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -471,7 +471,7 @@ private:
JavaVirtualMachine::JavaVirtualMachine(
css::uno::Reference< css::uno::XComponentContext > const & rContext):
- JavaVirtualMachine_Impl(m_aMutex),
+ WeakComponentImplHelper(m_aMutex),
m_xContext(rContext),
m_bDisposed(false),
m_pJavaVm(nullptr),
diff --git a/stoc/source/javavm/javavm.hxx b/stoc/source/javavm/javavm.hxx
index b2517fa22f69..e3551b29220f 100644
--- a/stoc/source/javavm/javavm.hxx
+++ b/stoc/source/javavm/javavm.hxx
@@ -52,18 +52,11 @@ namespace jvmaccess {
namespace stoc_javavm {
-// The MS compiler needs a typedef here, so the JavaVirtualMachine ctor can
call
-// its base class ctor:
-typedef
-cppu::WeakComponentImplHelper< css::lang::XInitialization,
- css::lang::XServiceInfo,
- css::java::XJavaVM,
- css::java::XJavaThreadRegister_11,
- css::container::XContainerListener >
-JavaVirtualMachine_Impl;
-
class JavaVirtualMachine:
- private cppu::BaseMutex, public JavaVirtualMachine_Impl
+ private cppu::BaseMutex,
+ public cppu::WeakComponentImplHelper<
+ css::lang::XInitialization, css::lang::XServiceInfo,
css::java::XJavaVM,
+ css::java::XJavaThreadRegister_11, css::container::XContainerListener>
{
public:
explicit JavaVirtualMachine(
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
