summaryrefslogtreecommitdiff
path: root/jvmaccess
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2005-07-07 09:54:43 +0000
committerOliver Bolte <obo@openoffice.org>2005-07-07 09:54:43 +0000
commit46d2f4623664f9f4c7678a5276c0e2dbd2776204 (patch)
tree53f956280386a7b2bcac64d09dafc81c5f57df53 /jvmaccess
parentf8d27321d072c5d28de8c6d8940db499af2cbe64 (diff)
INTEGRATION: CWS sb33 (1.5.2); FILE MERGED
2005/06/29 13:54:09 sb 1.5.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')
-rw-r--r--jvmaccess/util/msvc_win32_intel.map4
1 files changed, 2 insertions, 2 deletions
diff --git a/jvmaccess/util/msvc_win32_intel.map b/jvmaccess/util/msvc_win32_intel.map
index 432dc99c340a..49e3bba2023c 100644
--- a/jvmaccess/util/msvc_win32_intel.map
+++ b/jvmaccess/util/msvc_win32_intel.map
@@ -24,7 +24,7 @@ UDK_3.3 {
??0CreationException@UnoVirtualMachine@jvmaccess@@QAE@XZ; # jvmaccess::UnoVirtualMachine::CreationException::CreationException()
??1CreationException@UnoVirtualMachine@jvmaccess@@UAE@XZ; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException()
??4CreationException@UnoVirtualMachine@jvmaccess@@QAEAAV012@ABV012@@Z; # jvmaccess::UnoVirtualMachine::CreationException::operator =(CreationException const &)
- ??0UnoVirtualMachine@jvmaccess@@QAE@ABV?$Reference@VVirtualMachine@jvmaccess@@@rtl@@PAV_jobject@@@Z; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, jobject)
+ ??0UnoVirtualMachine@jvmaccess@@QAE@ABV?$Reference@VVirtualMachine@jvmaccess@@@rtl@@PAX@Z; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *)
?getVirtualMachine@UnoVirtualMachine@jvmaccess@@QBE?AV?$Reference@VVirtualMachine@jvmaccess@@@rtl@@XZ; # jvmaccess::UnoVirtualMachine::getVirtualMachine() const
- ?getClassLoader@UnoVirtualMachine@jvmaccess@@QBEPAV_jobject@@XZ; # jvmaccess::UnoVirtualMachine::getClassLoader() const
+ ?getClassLoader@UnoVirtualMachine@jvmaccess@@QBEPAXXZ; # jvmaccess::UnoVirtualMachine::getClassLoader() const
} UDK_3.2;