diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-01-09 08:47:03 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-01-09 08:47:03 +0000 |
| commit | eb688e4c07bf3ccffccab6cd27295e79f5ea3456 (patch) | |
| tree | 09e6bc861aca6cb2ccdc85c6beeb8ef1ff8ac82a | |
| parent | ad7eb954d451370ce63b5b7ee16c54867e671a7d (diff) | |
INTEGRATION: CWS mtg1 (1.21.12); FILE MERGED
2005/11/16 16:11:44 mtg 1.21.12.2: i#57753# back out my changes for asynchronous finalization
2005/11/15 13:22:59 mtg 1.21.12.1: A possible fix for i#57753#. A bit too brute force, and needs to be finessed, but a suitable starting point for discussion
| -rw-r--r-- | bridges/source/jni_uno/jni_java2uno.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx index 406ecf16ac3b..4cc6294ed257 100644 --- a/bridges/source/jni_uno/jni_java2uno.cxx +++ b/bridges/source/jni_uno/jni_java2uno.cxx @@ -4,9 +4,9 @@ * * $RCSfile: jni_java2uno.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: rt $ $Date: 2005-09-07 22:37:53 $ + * last change: $Author: rt $ $Date: 2006-01-09 09:47:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,6 +36,7 @@ #include <sal/alloca.h> #include "jni_bridge.h" +//#include "jni_finalizer.h" #include <rtl/ustrbuf.hxx> |