CWS-TOOLING: integrate CWS sb93

3 files changed, 6 insertions, 53 deletions

diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 2650b2620a50..22c8dc780b89 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: javavm.cxx,v $
- * $Revision: 1.78 $
+ * $Revision: 1.78.14.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -31,49 +31,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_stoc.hxx"
 
-/*
-  Code generation bug within Sun CC 5.2 on solaris sparc
-  Please check the following code against your compiler version before enabling
-  the optimization (when the program runs correct, it should print
-  1
-  2
-  ), otherwise nothing. The bug has crashed the
-  initVMConfiguration function, which can be found in this file.
-
-#include <stdio.h>
-
-static void b() {};
-struct E { ~E(){ b(); }  };
-
-void a()
-{
-    throw 42;
-}
-
-
-int main( int argc, char * argv[])
-{
-    E e1;
-    try
-    {
-        a();
-    }
-    catch( int i )
-    {
-    }
-    try
-    {
-        // this output never appears with CC -O test.cxx
-        fprintf( stderr,"1\n" );
-    }
-    catch( E & e )
-    {
-    }
-    // this output never appears with CC -O test.cxx
-    fprintf( stderr, "2\n" );
-}
-*/
-
 #include "javavm.hxx"
 
 #include "interact.hxx"
diff --git a/stoc/source/javavm/jen.xml b/stoc/source/javavm/jen.xml
index 4d324e0f3802..29ceb09db110 100644
--- a/stoc/source/javavm/jen.xml
+++ b/stoc/source/javavm/jen.xml
@@ -16,6 +16,10 @@ the existing vm given back.
         <status value="final"/>
         <supported-service> com.sun.star.java.JavaVirtualMachine    </supported-service>
         <service-dependency> ... </service-dependency>
+        <type>com.sun.star.beans.NamedValue</type>
+        <type>com.sun.star.java.XJavaThreadRegister_11</type>
+        <type>com.sun.star.uri/ExternalUriReferenceTranslator</type>
+        <type>com.sun.star.util.XMacroExpander</type>
         <type>  com.sun.star.java.XJavaVM                       </type>
         <type>  com.sun.star.java.XJavaVM                       </type>
         <type>  com.sun.star.container.XNameAccess              </type>
diff --git a/stoc/source/javavm/makefile.mk b/stoc/source/javavm/makefile.mk
index da3461ceed2d..ffd00418b050 100644
--- a/stoc/source/javavm/makefile.mk
+++ b/stoc/source/javavm/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.23 $
+# $Revision: 1.23.14.1 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -57,14 +57,6 @@ SLOFILES= \
         $(SLO)$/jvmargs.obj	\
         $(SLO)$/interact.obj 
 
-.IF "$(COM)"=="C52"
-# Code generation bug in conjunction with exception handling
-# You can find a codesample in javavm.cxx in a comment
-# at the top of the file
-NOOPTFILES= \
-        $(SLO)$/javavm.obj
-.ENDIF			# "$(COM)"=="C52"
-
 SHL1TARGET= $(TARGET)
 SHL1VERSIONMAP = jen.map
 SHL1STDLIBS= \