[Libreoffice-commits] core.git: include/jvmaccess jvmaccess/source
Stephan Bergmann
sbergman at redhat.com
Tue Oct 27 15:12:32 UTC 2015
include/jvmaccess/unovirtualmachine.hxx | 5 +++--
jvmaccess/source/unovirtualmachine.cxx | 5 ++++-
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit d00d5f6fe89fddb214aad2087d8352426c1c78d4
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 27 16:12:02 2015 +0100
Move member definition back into .cxx
Change-Id: Ie0698792c8785e0caee0e78222051451e5ebc65c
diff --git a/include/jvmaccess/unovirtualmachine.hxx b/include/jvmaccess/unovirtualmachine.hxx
index 5ff94a7..3826999 100644
--- a/include/jvmaccess/unovirtualmachine.hxx
+++ b/include/jvmaccess/unovirtualmachine.hxx
@@ -21,13 +21,14 @@
#define INCLUDED_JVMACCESS_UNOVIRTUALMACHINE_HXX
#include <jvmaccess/jvmaccessdllapi.h>
-#include <jvmaccess/virtualmachine.hxx>
#include <sal/config.h>
#include <salhelper/simplereferenceobject.hxx>
#include <rtl/ref.hxx>
namespace jvmaccess {
+class VirtualMachine;
+
/** An encapsulating wrapper around a Java virtual machine and an appropriate
UNO class loader.
*/
@@ -73,7 +74,7 @@ public:
@return
The Java virtual machine wrapper. Will never be null.
*/
- rtl::Reference< jvmaccess::VirtualMachine > getVirtualMachine() const { return m_virtualMachine;}
+ rtl::Reference< jvmaccess::VirtualMachine > getVirtualMachine() const;
/** Get the UNO class loader.
diff --git a/jvmaccess/source/unovirtualmachine.cxx b/jvmaccess/source/unovirtualmachine.cxx
index 5ec38d5..86be8b8 100644
--- a/jvmaccess/source/unovirtualmachine.cxx
+++ b/jvmaccess/source/unovirtualmachine.cxx
@@ -57,7 +57,10 @@ UnoVirtualMachine::UnoVirtualMachine(
}
}
-
+rtl::Reference< jvmaccess::VirtualMachine >
+UnoVirtualMachine::getVirtualMachine() const {
+ return m_virtualMachine;
+}
UnoVirtualMachine::~UnoVirtualMachine() {
try {
More information about the Libreoffice-commits
mailing list