INTEGRATION: CWS sb74 (1.2.6); FILE MERGED

2007/06/29 07:07:20 sb 1.2.6.1: #i78899# Completely removed JDK dependency from doTranslatToUrls/doLoadClass mangled names.

1 files changed, 7 insertions, 6 deletions

diff --git a/jvmaccess/inc/jvmaccess/classpath.hxx b/jvmaccess/inc/jvmaccess/classpath.hxx
index a4f1a057d5b8..bfc5aeeda10d 100644
--- a/jvmaccess/inc/jvmaccess/classpath.hxx
+++ b/jvmaccess/inc/jvmaccess/classpath.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: classpath.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: obo $ $Date: 2007-03-12 10:42:21 $
+ *  last change: $Author: rt $ $Date: 2007-07-03 12:42:01 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -143,18 +143,19 @@ private:
     ~ClassPath(); // not defined
     void operator =(ClassPath &); // not defined
 
-    // Functions that replace jobjectArray and jclass with void *, so that their
-    // mangled C++ names do not depend on the JDK version used at compile time:
+    // Functions that replace JNIEnv, jobjectArray, and jclass with void *, so
+    // that their mangled C++ names do not depend on the JDK version used at
+    // compile time:
 
     static void * doTranslateToUrls(
         ::com::sun::star::uno::Reference<
         ::com::sun::star::uno::XComponentContext > const & context,
-        ::JNIEnv * environment, ::rtl::OUString const & classPath);
+        void * environment, ::rtl::OUString const & classPath);
 
     static void * doLoadClass(
         ::com::sun::star::uno::Reference<
         ::com::sun::star::uno::XComponentContext > const & context,
-        ::JNIEnv * environment, ::rtl::OUString const & classPath,
+        void * environment, ::rtl::OUString const & classPath,
         ::rtl::OUString const & name);
 };