diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-07-07 09:53:52 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-07-07 09:53:52 +0000 |
| commit | 0cbb9ec2a1b0b54227d6ce3e55a66e33b6118003 (patch) | |
| tree | eb194ae4f37eaf50a8c20faf61593becaab325e5 /jvmaccess/source | |
| parent | 3d51aebabb160607e64d71c194222b51418d01f1 (diff) | |
INTEGRATION: CWS sb33 (1.2.2); FILE MERGED
2005/06/29 13:54:08 sb 1.2.2.1: #i51091# Changed occurences of jobject in the jvmaccess API to void* to avoid different mangled C++ names for different JDKs.
Diffstat (limited to 'jvmaccess/source')
| -rw-r--r-- | jvmaccess/source/unovirtualmachine.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/jvmaccess/source/unovirtualmachine.cxx b/jvmaccess/source/unovirtualmachine.cxx index bb2bc8c9da7a..b169332d8796 100644 --- a/jvmaccess/source/unovirtualmachine.cxx +++ b/jvmaccess/source/unovirtualmachine.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unovirtualmachine.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: obo $ $Date: 2005-06-17 09:21:14 $ + * last change: $Author: obo $ $Date: 2005-07-07 10:53:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,7 +88,7 @@ UnoVirtualMachine::CreationException::operator =(CreationException const &) { UnoVirtualMachine::UnoVirtualMachine( rtl::Reference< jvmaccess::VirtualMachine > const & virtualMachine, - jobject classLoader): + void * classLoader): m_virtualMachine(virtualMachine), m_classLoader(0) { @@ -96,7 +96,7 @@ UnoVirtualMachine::UnoVirtualMachine( try { m_classLoader = jvmaccess::VirtualMachine::AttachGuard(m_virtualMachine). - getEnvironment()->NewGlobalRef(classLoader); + getEnvironment()->NewGlobalRef(static_cast< jobject >(classLoader)); } catch (jvmaccess::VirtualMachine::AttachGuard::CreationException &) {} #endif if (m_classLoader == 0) { @@ -109,7 +109,7 @@ UnoVirtualMachine::getVirtualMachine() const { return m_virtualMachine; } -jobject UnoVirtualMachine::getClassLoader() const { +void * UnoVirtualMachine::getClassLoader() const { return m_classLoader; } @@ -117,7 +117,8 @@ UnoVirtualMachine::~UnoVirtualMachine() { #if defined SOLAR_JAVA try { jvmaccess::VirtualMachine::AttachGuard(m_virtualMachine). - getEnvironment()->DeleteGlobalRef(m_classLoader); + getEnvironment()->DeleteGlobalRef( + static_cast< jobject >(m_classLoader)); } catch (jvmaccess::VirtualMachine::AttachGuard::CreationException &) { OSL_TRACE( "jvmaccess::UnoVirtualMachine::~UnoVirtualMachine:" |