diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 09:04:58 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 09:04:58 +0000 |
commit | 3b2b8f91ff22b93050b9b1aa3da5bd4359182499 (patch) | |
tree | 3e37aa664496da562640735b168da4dcc08bb737 /stoc | |
parent | 257b3205cae2665a96492b806df10faf884a4e99 (diff) |
CWS-TOOLING: integrate CWS sb93
Diffstat (limited to 'stoc')
-rw-r--r-- | stoc/source/corereflection/corefl.xml | 1 | ||||
-rw-r--r-- | stoc/source/inspect/insp.xml | 1 | ||||
-rw-r--r-- | stoc/source/javavm/javavm.cxx | 45 | ||||
-rw-r--r-- | stoc/source/javavm/jen.xml | 4 | ||||
-rw-r--r-- | stoc/source/javavm/makefile.mk | 10 | ||||
-rw-r--r-- | stoc/source/namingservice/namingservice.xml | 1 |
6 files changed, 9 insertions, 53 deletions
diff --git a/stoc/source/corereflection/corefl.xml b/stoc/source/corereflection/corefl.xml index 8bf757a2ae32..5dba80b6abff 100644 --- a/stoc/source/corereflection/corefl.xml +++ b/stoc/source/corereflection/corefl.xml @@ -15,6 +15,7 @@ The service provides reflection and access to all uno types <status value="final"/> <supported-service> com.sun.star.reflection.CoreReflection </supported-service> <service-dependency> ... </service-dependency> + <type>com.sun.star.lang.DisposedException</type> <type> com.sun.star.reflection.XTypeDescription </type> <type> com.sun.star.reflection.XIdlReflection </type> <type> com.sun.star.reflection.XIdlClass </type> diff --git a/stoc/source/inspect/insp.xml b/stoc/source/inspect/insp.xml index d0ec9c1b3076..48b46d273cb1 100644 --- a/stoc/source/inspect/insp.xml +++ b/stoc/source/inspect/insp.xml @@ -16,6 +16,7 @@ <status value="final"/> <supported-service> com.sun.star.beans.Introspection </supported-service> <service-dependency> com.sun.star.reflection.CoreReflection </service-dependency> + <type>com.sun.star.lang.DisposedException</type> <type> com.sun.star.beans.XIntrospection </type> <type> com.sun.star.beans.XIntrospectionAccess </type> <type> com.sun.star.beans.XPropertySet </type> 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= \ diff --git a/stoc/source/namingservice/namingservice.xml b/stoc/source/namingservice/namingservice.xml index 23cbee74ee55..2b9d9365ea62 100644 --- a/stoc/source/namingservice/namingservice.xml +++ b/stoc/source/namingservice/namingservice.xml @@ -12,6 +12,7 @@ The naming service allows the registration and retrieval of objects. <language> c++ </language> <status value="final"/> <supported-service> com.sun.star.uno.NamingService </supported-service> + <type>com.sun.star.lang.DisposedException</type> <type> com.sun.star.lang.XComponent </type> <type> com.sun.star.lang.IllegalArgumentException </type> <type> com.sun.star.lang.XInitialization </type> |