diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-06-04 02:15:07 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-06-04 02:15:07 +0000 |
| commit | cae12c2870750f7cd86cb5690d767a0aa724868d (patch) | |
| tree | 2e3c125a085ca90b9150ba8058e7a8ec50f803ca /codemaker/test | |
| parent | c0205c088c058b790af3e333a5a1c4d0b76896ca (diff) | |
INTEGRATION: CWS sb18 (1.2.4); FILE MERGED
2004/06/01 13:27:32 sb 1.2.4.3: #i21150# Work around MS compiler bug that default-initialized primitive class members are left uninitialized.
2004/04/28 09:00:34 sb 1.2.4.2: #i21150# Added struct alignment tests.
2004/04/22 08:28:19 sb 1.2.4.1: #i21150# Added support for polymorphic struct types.
Diffstat (limited to 'codemaker/test')
| -rw-r--r-- | codemaker/test/cppumaker/types.idl | 61 |
1 files changed, 59 insertions, 2 deletions
diff --git a/codemaker/test/cppumaker/types.idl b/codemaker/test/cppumaker/types.idl index 7f1798f64dc6..00923ede7d53 100644 --- a/codemaker/test/cppumaker/types.idl +++ b/codemaker/test/cppumaker/types.idl @@ -2,9 +2,9 @@ * * $RCSfile: types.idl,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2004-03-30 16:54:12 $ + * last change: $Author: obo $ $Date: 2004-06-04 03:15:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,8 @@ * ************************************************************************/ +//TODO: Do not depend on types for which C++ header files are only generated +// later in the build process in offuh: #include "com/sun/star/lang/ClassNotFoundException.idl" #include "com/sun/star/lang/IllegalAccessException.idl" #include "com/sun/star/lang/Locale.idl" @@ -556,4 +558,59 @@ singleton NDEBUG: com::sun::star::uno::XNamingService; singleton get: com::sun::star::uno::XNamingService; +enum HelperEnum { ZERO, ONE }; + +struct HelperStruct { boolean m1; com::sun::star::uno::XInterface m2; }; + +typedef byte TDByte; +typedef HelperEnum TDEnum1; +typedef TDEnum1 TDEnum; + +struct BigStruct { + boolean m1; + byte m2; + short m3; + unsigned short m4; + long m5; + unsigned long m6; + hyper m7; + unsigned hyper m8; + float m9; + double m10; + char m11; + string m12; + type m13; + any m14; + sequence<boolean> m15; + HelperEnum m16; + HelperStruct m17; + com::sun::star::uno::XInterface m18; + TDByte m19; + TDEnum m20; +}; + +struct Struct<T, U> { + T member1; + sequence<SequenceAny> member2; +}; + +struct StructUsage { + Struct< long, short > member1; + sequence< + sequence< + Struct< + sequence< Struct< any, boolean > >, + com::sun::star::uno::XInterface > > > + member2; +}; + +struct AlignmentBaseStruct { + double member1; + short member2; +}; + +struct AlignmentDerivedStruct: AlignmentBaseStruct { + short member3; +}; + }; }; }; |