From 1c27cf9b0bb17eb20e03bbdf05aab8bc2f0cd497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Tue, 3 Jul 2007 11:43:21 +0000 Subject: [PATCH] INTEGRATION: CWS sb74 (1.7.6); FILE MERGED 2007/06/29 07:07:20 sb 1.7.6.1: #i78899# Completely removed JDK dependency from doTranslatToUrls/doLoadClass mangled names. --- jvmaccess/util/msvc_win32_intel.map | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jvmaccess/util/msvc_win32_intel.map b/jvmaccess/util/msvc_win32_intel.map index 7f4db33f146e..fd148b1892ba 100644 --- a/jvmaccess/util/msvc_win32_intel.map +++ b/jvmaccess/util/msvc_win32_intel.map @@ -29,9 +29,9 @@ UDK_3.3 { ?getClassLoader@UnoVirtualMachine@jvmaccess@@QBEPAXXZ; # jvmaccess::UnoVirtualMachine::getClassLoader() const } UDK_3.2; -UDK_3.4 { +UDK_3.4 { # OOo 2.3 global: # jvmaccess/classpath.hxx: - ?doLoadClass@ClassPath@jvmaccess@@CAPAXABV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@PAUJNIEnv_@@ABVOUString@rtl@@2@Z; # jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, JNIEnv *, rtl::OUString const &, rtl::OUString const &) - ?doTranslateToUrls@ClassPath@jvmaccess@@CAPAXABV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@PAUJNIEnv_@@ABVOUString@rtl@@@Z; # jvmaccess::ClassPath::doTranslateToUrls(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, JNIEnv *, rtl::OUString const &) + ?doLoadClass@ClassPath@jvmaccess@@CAPAXABV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@PAXABVOUString@rtl@@2@Z; # jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &, rtl::OUString const &) + ?doTranslateToUrls@ClassPath@jvmaccess@@CAPAXABV?$Reference@VXComponentContext@uno@star@sun@com@@@uno@star@sun@com@@PAXABVOUString@rtl@@@Z; # jvmaccess::ClassPath::doTranslateToUrls(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &) } UDK_3.3;