[Libreoffice-commits] .: codemaker/prj codemaker/test cppu/prj cppu/qa

Caolán McNamara caolan at kemper.freedesktop.org
Tue Mar 15 06:41:33 PDT 2011


 codemaker/prj/build.lst                               |    2 
 codemaker/test/cppumaker/makefile.mk                  |   73 -
 codemaker/test/cppumaker/test_codemaker_cppumaker.cxx |  572 --------------
 codemaker/test/cppumaker/types.idl                    |  717 ------------------
 codemaker/test/cppumaker/version.map                  |   34 
 cppu/prj/build.lst                                    |    3 
 cppu/qa/cppumaker/makefile.mk                         |   72 +
 cppu/qa/cppumaker/test_cppumaker.cxx                  |  572 ++++++++++++++
 cppu/qa/cppumaker/types.idl                           |  717 ++++++++++++++++++
 cppu/qa/cppumaker/version.map                         |   34 
 10 files changed, 1397 insertions(+), 1399 deletions(-)

New commits:
commit 4025aa1c48a8de44c89586cc95482f022d4eda3f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 15 13:41:19 2011 +0000

    move cppumaker test to cppu

diff --git a/codemaker/prj/build.lst b/codemaker/prj/build.lst
index 71f5290..a0fa864 100644
--- a/codemaker/prj/build.lst
+++ b/codemaker/prj/build.lst
@@ -7,5 +7,3 @@ cm	codemaker\source\commoncpp				nmake	-	all	cm_cpp cm_inc NULL
 cm	codemaker\source\cppumaker				nmake	-	all	cm_cppumaker 	cm_codemaker cm_cpp cm_inc NULL
 cm	codemaker\source\commonjava				nmake	-	all	cm_java cm_inc NULL
 cm	codemaker\source\javamaker				nmake	-	all	cm_javamaker cm_codemaker cm_java cm_inc NULL
-cm  codemaker\test\cppumaker                nmake   -   all cm_test_cppumaker cm_cppumaker NULL
-
diff --git a/codemaker/test/cppumaker/makefile.mk b/codemaker/test/cppumaker/makefile.mk
deleted file mode 100644
index c91d3c6..0000000
--- a/codemaker/test/cppumaker/makefile.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..$/..
-PRJNAME := codemaker
-TARGET := test_codemaker_cppumaker
-
-ENABLE_EXCEPTIONS := TRUE
-
-.INCLUDE: settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-DLLPRE = # no leading "lib" on .so files
-
-INCPRE += $(MISC)$/$(TARGET)$/inc
-
-SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/test_codemaker_cppumaker.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
-SHL1VERSIONMAP = version.map
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
-
-.INCLUDE: target.mk
-
-ALLTAR: test
-
-$(SHL1OBJS): $(MISC)$/$(TARGET).cppumaker.flag
-
-$(MISC)$/$(TARGET).cppumaker.flag: $(BIN)$/cppumaker$(EXECPOST)
-$(MISC)$/$(TARGET).cppumaker.flag: $(MISC)$/$(TARGET).rdb
-    - $(MKDIRHIER) $(MISC)$/$(TARGET)$/inc
-    $(AUGMENT_LIBRARY_PATH) $(BIN)$/cppumaker$(EXECPOST) \
-        -O$(MISC)$/$(TARGET)$/inc -BUCR -C $< $(SOLARBINDIR)$/udkapi.rdb
-    $(TOUCH) $@
-
-$(MISC)$/$(TARGET).rdb: $(MISC)$/$(TARGET)$/types.urd
-    - rm $@
-    $(REGMERGE) $@ /UCR $<
-
-$(MISC)$/$(TARGET)$/types.urd: types.idl
-    - $(MKDIR) $(MISC)$/$(TARGET)
-    $(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $<
-
-test .PHONY: $(SHL1TARGETN)
-    $(CPPUNITTESTER) $<
diff --git a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx b/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
deleted file mode 100644
index 6d9df43..0000000
--- a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
+++ /dev/null
@@ -1,572 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_codemaker.hxx"
-
-#include "FILE.hpp"
-#include "lconv.hpp"
-#include "tm.hpp"
-#include "std.hpp"
-#include "test/codemaker/cppumaker/XTest.hpp"
-#include "test/codemaker/cppumaker/S1.hpp"
-#include "test/codemaker/cppumaker/services/asm.hpp"
-#include "test/codemaker/cppumaker/services/auto.hpp"
-#include "test/codemaker/cppumaker/services/bool.hpp"
-#include "test/codemaker/cppumaker/services/break.hpp"
-//TODO: #include "test/codemaker/cppumaker/services/case.hpp"
-#include "test/codemaker/cppumaker/services/catch.hpp"
-//TODO: #include "test/codemaker/cppumaker/services/char.hpp"
-#include "test/codemaker/cppumaker/services/class.hpp"
-//TODO: #include "test/codemaker/cppumaker/services/const.hpp"
-#include "test/codemaker/cppumaker/services/continue.hpp"
-//TODO: #include "test/codemaker/cppumaker/services/default.hpp"
-#include "test/codemaker/cppumaker/services/delete.hpp"
-#include "test/codemaker/cppumaker/services/do.hpp"
-//TODO: #include "test/codemaker/cppumaker/services/double.hpp"
-#include "test/codemaker/cppumaker/services/else.hpp"
-//TODO: #include "test/codemaker/cppumaker/services/enum.hpp"
-#include "test/codemaker/cppumaker/services/explicit.hpp"
-#include "test/codemaker/cppumaker/services/export.hpp"
-#include "test/codemaker/cppumaker/services/extern.hpp"
-#include "test/codemaker/cppumaker/services/false.hpp"
-//TODO: #include "test/codemaker/cppumaker/services/float.hpp"
-#include "test/codemaker/cppumaker/services/for.hpp"
-#include "test/codemaker/cppumaker/services/friend.hpp"
-#include "test/codemaker/cppumaker/services/goto.hpp"
-#include "test/codemaker/cppumaker/services/if.hpp"
-#include "test/codemaker/cppumaker/services/inline.hpp"
-#include "test/codemaker/cppumaker/services/int.hpp"
-//TODO: #include "test/codemaker/cppumaker/services/long.hpp"
-#include "test/codemaker/cppumaker/services/mutable.hpp"
-#include "test/codemaker/cppumaker/services/namespace.hpp"
-#include "test/codemaker/cppumaker/services/new.hpp"
-#include "test/codemaker/cppumaker/services/operator.hpp"
-#include "test/codemaker/cppumaker/services/private.hpp"
-#include "test/codemaker/cppumaker/services/protected.hpp"
-#include "test/codemaker/cppumaker/services/public.hpp"
-#include "test/codemaker/cppumaker/services/register.hpp"
-#include "test/codemaker/cppumaker/services/return.hpp"
-//TODO: #include "test/codemaker/cppumaker/services/short.hpp"
-#include "test/codemaker/cppumaker/services/signed.hpp"
-#include "test/codemaker/cppumaker/services/sizeof.hpp"
-#include "test/codemaker/cppumaker/services/static.hpp"
-//TODO: #include "test/codemaker/cppumaker/services/struct.hpp"
-//TODO: #include "test/codemaker/cppumaker/services/switch.hpp"
-#include "test/codemaker/cppumaker/services/template.hpp"
-#include "test/codemaker/cppumaker/services/this.hpp"
-#include "test/codemaker/cppumaker/services/throw.hpp"
-#include "test/codemaker/cppumaker/services/true.hpp"
-#include "test/codemaker/cppumaker/services/try.hpp"
-//TODO: #include "test/codemaker/cppumaker/services/typedef.hpp"
-#include "test/codemaker/cppumaker/services/typeid.hpp"
-#include "test/codemaker/cppumaker/services/typename.hpp"
-//TODO: #include "test/codemaker/cppumaker/services/union.hpp"
-//TODO: #include "test/codemaker/cppumaker/services/unsigned.hpp"
-#include "test/codemaker/cppumaker/services/using.hpp"
-#include "test/codemaker/cppumaker/services/virtual.hpp"
-//TODO: #include "test/codemaker/cppumaker/services/void.hpp"
-#include "test/codemaker/cppumaker/services/volatile.hpp"
-#include "test/codemaker/cppumaker/services/while.hpp"
-#include "test/codemaker/cppumaker/services/and.hpp"
-#include "test/codemaker/cppumaker/services/bitand.hpp"
-#include "test/codemaker/cppumaker/services/bitor.hpp"
-#include "test/codemaker/cppumaker/services/compl.hpp"
-#include "test/codemaker/cppumaker/services/not.hpp"
-#include "test/codemaker/cppumaker/services/or.hpp"
-#include "test/codemaker/cppumaker/services/xor.hpp"
-#include "test/codemaker/cppumaker/services/BUFSIZ.hpp"
-#include "test/codemaker/cppumaker/services/CLOCKS_PER_SEC.hpp"
-#include "test/codemaker/cppumaker/services/EDOM.hpp"
-#include "test/codemaker/cppumaker/services/EOF.hpp"
-#include "test/codemaker/cppumaker/services/ERANGE.hpp"
-#include "test/codemaker/cppumaker/services/EXIT_FAILURE.hpp"
-#include "test/codemaker/cppumaker/services/EXIT_SUCCESS.hpp"
-#include "test/codemaker/cppumaker/services/FILENAME_MAX.hpp"
-#include "test/codemaker/cppumaker/services/FOPEN_MAX.hpp"
-#include "test/codemaker/cppumaker/services/HUGE_VAL.hpp"
-#include "test/codemaker/cppumaker/services/LC_ALL.hpp"
-#include "test/codemaker/cppumaker/services/LC_COLLATE.hpp"
-#include "test/codemaker/cppumaker/services/LC_CTYPE.hpp"
-#include "test/codemaker/cppumaker/services/LC_MONETARY.hpp"
-#include "test/codemaker/cppumaker/services/LC_NUMERIC.hpp"
-#include "test/codemaker/cppumaker/services/LC_TIME.hpp"
-#include "test/codemaker/cppumaker/services/L_tmpnam.hpp"
-#include "test/codemaker/cppumaker/services/MB_CUR_MAX.hpp"
-#include "test/codemaker/cppumaker/services/NULL.hpp"
-#include "test/codemaker/cppumaker/services/RAND_MAX.hpp"
-#include "test/codemaker/cppumaker/services/SEEK_CUR.hpp"
-#include "test/codemaker/cppumaker/services/SEEK_END.hpp"
-#include "test/codemaker/cppumaker/services/SEEK_SET.hpp"
-#include "test/codemaker/cppumaker/services/SIGABRT.hpp"
-#include "test/codemaker/cppumaker/services/SIGFPE.hpp"
-#include "test/codemaker/cppumaker/services/SIGILL.hpp"
-#include "test/codemaker/cppumaker/services/SIGINT.hpp"
-#include "test/codemaker/cppumaker/services/SIGSEGV.hpp"
-#include "test/codemaker/cppumaker/services/SIGTERM.hpp"
-#include "test/codemaker/cppumaker/services/SIG_DFL.hpp"
-#include "test/codemaker/cppumaker/services/SIG_ERR.hpp"
-#include "test/codemaker/cppumaker/services/SIG_IGN.hpp"
-#include "test/codemaker/cppumaker/services/TMP_MAX.hpp"
-#include "test/codemaker/cppumaker/services/WCHAR_MAX.hpp"
-#include "test/codemaker/cppumaker/services/WCHAR_MIN.hpp"
-#include "test/codemaker/cppumaker/services/WEOF.hpp"
-#include "test/codemaker/cppumaker/services/assert.hpp"
-#include "test/codemaker/cppumaker/services/errno.hpp"
-#include "test/codemaker/cppumaker/services/offsetof.hpp"
-#include "test/codemaker/cppumaker/services/setjmp.hpp"
-#include "test/codemaker/cppumaker/services/stderr.hpp"
-#include "test/codemaker/cppumaker/services/stdin.hpp"
-#include "test/codemaker/cppumaker/services/stdout.hpp"
-#include "test/codemaker/cppumaker/services/CHAR_BIT.hpp"
-#include "test/codemaker/cppumaker/services/CHAR_MAX.hpp"
-#include "test/codemaker/cppumaker/services/CHAR_MIN.hpp"
-#include "test/codemaker/cppumaker/services/DBL_DIG.hpp"
-#include "test/codemaker/cppumaker/services/DBL_EPSILON.hpp"
-#include "test/codemaker/cppumaker/services/DBL_MANT_DIG.hpp"
-#include "test/codemaker/cppumaker/services/DBL_MAX.hpp"
-#include "test/codemaker/cppumaker/services/DBL_MAX_10_EXP.hpp"
-#include "test/codemaker/cppumaker/services/DBL_MAX_EXP.hpp"
-#include "test/codemaker/cppumaker/services/DBL_MIN.hpp"
-#include "test/codemaker/cppumaker/services/DBL_MIN_10_EXP.hpp"
-#include "test/codemaker/cppumaker/services/DBL_MIN_EXP.hpp"
-#include "test/codemaker/cppumaker/services/FLT_DIG.hpp"
-#include "test/codemaker/cppumaker/services/FLT_EPSILON.hpp"
-#include "test/codemaker/cppumaker/services/FLT_MANT_DIG.hpp"
-#include "test/codemaker/cppumaker/services/FLT_MAX.hpp"
-#include "test/codemaker/cppumaker/services/FLT_MAX_10_EXP.hpp"
-#include "test/codemaker/cppumaker/services/FLT_MAX_EXP.hpp"
-#include "test/codemaker/cppumaker/services/FLT_MIN.hpp"
-#include "test/codemaker/cppumaker/services/FLT_MIN_10_EXP.hpp"
-#include "test/codemaker/cppumaker/services/FLT_MIN_EXP.hpp"
-#include "test/codemaker/cppumaker/services/FLT_RADIX.hpp"
-#include "test/codemaker/cppumaker/services/FLT_ROUNDS.hpp"
-#include "test/codemaker/cppumaker/services/INT_MAX.hpp"
-#include "test/codemaker/cppumaker/services/INT_MIN.hpp"
-#include "test/codemaker/cppumaker/services/LDBL_DIG.hpp"
-#include "test/codemaker/cppumaker/services/LDBL_EPSILON.hpp"
-#include "test/codemaker/cppumaker/services/LDBL_MANT_DIG.hpp"
-#include "test/codemaker/cppumaker/services/LDBL_MAX.hpp"
-#include "test/codemaker/cppumaker/services/LDBL_MAX_10_EXP.hpp"
-#include "test/codemaker/cppumaker/services/LDBL_MAX_EXP.hpp"
-#include "test/codemaker/cppumaker/services/LDBL_MIN.hpp"
-#include "test/codemaker/cppumaker/services/LDBL_MIN_10_EXP.hpp"
-#include "test/codemaker/cppumaker/services/LDBL_MIN_EXP.hpp"
-#include "test/codemaker/cppumaker/services/LONG_MAX.hpp"
-#include "test/codemaker/cppumaker/services/LONG_MIN.hpp"
-#include "test/codemaker/cppumaker/services/MB_LEN_MAX.hpp"
-#include "test/codemaker/cppumaker/services/SCHAR_MAX.hpp"
-#include "test/codemaker/cppumaker/services/SCHAR_MIN.hpp"
-#include "test/codemaker/cppumaker/services/SHRT_MAX.hpp"
-#include "test/codemaker/cppumaker/services/SHRT_MIN.hpp"
-#include "test/codemaker/cppumaker/services/UCHAR_MAX.hpp"
-#include "test/codemaker/cppumaker/services/UINT_MAX.hpp"
-#include "test/codemaker/cppumaker/services/ULONG_MAX.hpp"
-#include "test/codemaker/cppumaker/services/USHRT_MAX.hpp"
-#include "test/codemaker/cppumaker/services/FILE.hpp"
-#include "test/codemaker/cppumaker/services/lconv.hpp"
-#include "test/codemaker/cppumaker/services/tm.hpp"
-#include "test/codemaker/cppumaker/services/std.hpp"
-#include "test/codemaker/cppumaker/services/NDEBUG.hpp"
-#include "test/codemaker/cppumaker/services/create.hpp"
-#include "test/codemaker/cppumaker/singletons/asm.hpp"
-#include "test/codemaker/cppumaker/singletons/auto.hpp"
-#include "test/codemaker/cppumaker/singletons/bool.hpp"
-#include "test/codemaker/cppumaker/singletons/break.hpp"
-//TODO: #include "test/codemaker/cppumaker/singletons/case.hpp"
-#include "test/codemaker/cppumaker/singletons/catch.hpp"
-//TODO: #include "test/codemaker/cppumaker/singletons/char.hpp"
-#include "test/codemaker/cppumaker/singletons/class.hpp"
-//TODO: #include "test/codemaker/cppumaker/singletons/const.hpp"
-#include "test/codemaker/cppumaker/singletons/continue.hpp"
-//TODO: #include "test/codemaker/cppumaker/singletons/default.hpp"
-#include "test/codemaker/cppumaker/singletons/delete.hpp"
-#include "test/codemaker/cppumaker/singletons/do.hpp"
-//TODO: #include "test/codemaker/cppumaker/singletons/double.hpp"
-#include "test/codemaker/cppumaker/singletons/else.hpp"
-//TODO: #include "test/codemaker/cppumaker/singletons/enum.hpp"
-#include "test/codemaker/cppumaker/singletons/explicit.hpp"
-#include "test/codemaker/cppumaker/singletons/export.hpp"
-#include "test/codemaker/cppumaker/singletons/extern.hpp"
-#include "test/codemaker/cppumaker/singletons/false.hpp"
-//TODO: #include "test/codemaker/cppumaker/singletons/float.hpp"
-#include "test/codemaker/cppumaker/singletons/for.hpp"
-#include "test/codemaker/cppumaker/singletons/friend.hpp"
-#include "test/codemaker/cppumaker/singletons/goto.hpp"
-#include "test/codemaker/cppumaker/singletons/if.hpp"
-#include "test/codemaker/cppumaker/singletons/inline.hpp"
-#include "test/codemaker/cppumaker/singletons/int.hpp"
-//TODO: #include "test/codemaker/cppumaker/singletons/long.hpp"
-#include "test/codemaker/cppumaker/singletons/mutable.hpp"
-#include "test/codemaker/cppumaker/singletons/namespace.hpp"
-#include "test/codemaker/cppumaker/singletons/new.hpp"
-#include "test/codemaker/cppumaker/singletons/operator.hpp"
-#include "test/codemaker/cppumaker/singletons/private.hpp"
-#include "test/codemaker/cppumaker/singletons/protected.hpp"
-#include "test/codemaker/cppumaker/singletons/public.hpp"
-#include "test/codemaker/cppumaker/singletons/register.hpp"
-#include "test/codemaker/cppumaker/singletons/return.hpp"
-//TODO: #include "test/codemaker/cppumaker/singletons/short.hpp"
-#include "test/codemaker/cppumaker/singletons/signed.hpp"
-#include "test/codemaker/cppumaker/singletons/sizeof.hpp"
-#include "test/codemaker/cppumaker/singletons/static.hpp"
-//TODO: #include "test/codemaker/cppumaker/singletons/struct.hpp"
-//TODO: #include "test/codemaker/cppumaker/singletons/switch.hpp"
-#include "test/codemaker/cppumaker/singletons/template.hpp"
-#include "test/codemaker/cppumaker/singletons/this.hpp"
-#include "test/codemaker/cppumaker/singletons/throw.hpp"
-#include "test/codemaker/cppumaker/singletons/true.hpp"
-#include "test/codemaker/cppumaker/singletons/try.hpp"
-//TODO: #include "test/codemaker/cppumaker/singletons/typedef.hpp"
-#include "test/codemaker/cppumaker/singletons/typeid.hpp"
-#include "test/codemaker/cppumaker/singletons/typename.hpp"
-//TODO: #include "test/codemaker/cppumaker/singletons/union.hpp"
-//TODO: #include "test/codemaker/cppumaker/singletons/unsigned.hpp"
-#include "test/codemaker/cppumaker/singletons/using.hpp"
-#include "test/codemaker/cppumaker/singletons/virtual.hpp"
-//TODO: #include "test/codemaker/cppumaker/singletons/void.hpp"
-#include "test/codemaker/cppumaker/singletons/volatile.hpp"
-#include "test/codemaker/cppumaker/singletons/while.hpp"
-#include "test/codemaker/cppumaker/singletons/and.hpp"
-#include "test/codemaker/cppumaker/singletons/bitand.hpp"
-#include "test/codemaker/cppumaker/singletons/bitor.hpp"
-#include "test/codemaker/cppumaker/singletons/compl.hpp"
-#include "test/codemaker/cppumaker/singletons/not.hpp"
-#include "test/codemaker/cppumaker/singletons/or.hpp"
-#include "test/codemaker/cppumaker/singletons/xor.hpp"
-#include "test/codemaker/cppumaker/singletons/BUFSIZ.hpp"
-#include "test/codemaker/cppumaker/singletons/CLOCKS_PER_SEC.hpp"
-#include "test/codemaker/cppumaker/singletons/EDOM.hpp"
-#include "test/codemaker/cppumaker/singletons/EOF.hpp"
-#include "test/codemaker/cppumaker/singletons/ERANGE.hpp"
-#include "test/codemaker/cppumaker/singletons/EXIT_FAILURE.hpp"
-#include "test/codemaker/cppumaker/singletons/EXIT_SUCCESS.hpp"
-#include "test/codemaker/cppumaker/singletons/FILENAME_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/FOPEN_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/HUGE_VAL.hpp"
-#include "test/codemaker/cppumaker/singletons/LC_ALL.hpp"
-#include "test/codemaker/cppumaker/singletons/LC_COLLATE.hpp"
-#include "test/codemaker/cppumaker/singletons/LC_CTYPE.hpp"
-#include "test/codemaker/cppumaker/singletons/LC_MONETARY.hpp"
-#include "test/codemaker/cppumaker/singletons/LC_NUMERIC.hpp"
-#include "test/codemaker/cppumaker/singletons/LC_TIME.hpp"
-#include "test/codemaker/cppumaker/singletons/L_tmpnam.hpp"
-#include "test/codemaker/cppumaker/singletons/MB_CUR_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/NULL.hpp"
-#include "test/codemaker/cppumaker/singletons/RAND_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/SEEK_CUR.hpp"
-#include "test/codemaker/cppumaker/singletons/SEEK_END.hpp"
-#include "test/codemaker/cppumaker/singletons/SEEK_SET.hpp"
-#include "test/codemaker/cppumaker/singletons/SIGABRT.hpp"
-#include "test/codemaker/cppumaker/singletons/SIGFPE.hpp"
-#include "test/codemaker/cppumaker/singletons/SIGILL.hpp"
-#include "test/codemaker/cppumaker/singletons/SIGINT.hpp"
-#include "test/codemaker/cppumaker/singletons/SIGSEGV.hpp"
-#include "test/codemaker/cppumaker/singletons/SIGTERM.hpp"
-#include "test/codemaker/cppumaker/singletons/SIG_DFL.hpp"
-#include "test/codemaker/cppumaker/singletons/SIG_ERR.hpp"
-#include "test/codemaker/cppumaker/singletons/SIG_IGN.hpp"
-#include "test/codemaker/cppumaker/singletons/TMP_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/WCHAR_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/WCHAR_MIN.hpp"
-#include "test/codemaker/cppumaker/singletons/WEOF.hpp"
-#include "test/codemaker/cppumaker/singletons/assert.hpp"
-#include "test/codemaker/cppumaker/singletons/errno.hpp"
-#include "test/codemaker/cppumaker/singletons/offsetof.hpp"
-#include "test/codemaker/cppumaker/singletons/setjmp.hpp"
-#include "test/codemaker/cppumaker/singletons/stderr.hpp"
-#include "test/codemaker/cppumaker/singletons/stdin.hpp"
-#include "test/codemaker/cppumaker/singletons/stdout.hpp"
-#include "test/codemaker/cppumaker/singletons/CHAR_BIT.hpp"
-#include "test/codemaker/cppumaker/singletons/CHAR_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/CHAR_MIN.hpp"
-#include "test/codemaker/cppumaker/singletons/DBL_DIG.hpp"
-#include "test/codemaker/cppumaker/singletons/DBL_EPSILON.hpp"
-#include "test/codemaker/cppumaker/singletons/DBL_MANT_DIG.hpp"
-#include "test/codemaker/cppumaker/singletons/DBL_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/DBL_MAX_10_EXP.hpp"
-#include "test/codemaker/cppumaker/singletons/DBL_MAX_EXP.hpp"
-#include "test/codemaker/cppumaker/singletons/DBL_MIN.hpp"
-#include "test/codemaker/cppumaker/singletons/DBL_MIN_10_EXP.hpp"
-#include "test/codemaker/cppumaker/singletons/DBL_MIN_EXP.hpp"
-#include "test/codemaker/cppumaker/singletons/FLT_DIG.hpp"
-#include "test/codemaker/cppumaker/singletons/FLT_EPSILON.hpp"
-#include "test/codemaker/cppumaker/singletons/FLT_MANT_DIG.hpp"
-#include "test/codemaker/cppumaker/singletons/FLT_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/FLT_MAX_10_EXP.hpp"
-#include "test/codemaker/cppumaker/singletons/FLT_MAX_EXP.hpp"
-#include "test/codemaker/cppumaker/singletons/FLT_MIN.hpp"
-#include "test/codemaker/cppumaker/singletons/FLT_MIN_10_EXP.hpp"
-#include "test/codemaker/cppumaker/singletons/FLT_MIN_EXP.hpp"
-#include "test/codemaker/cppumaker/singletons/FLT_RADIX.hpp"
-#include "test/codemaker/cppumaker/singletons/FLT_ROUNDS.hpp"
-#include "test/codemaker/cppumaker/singletons/INT_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/INT_MIN.hpp"
-#include "test/codemaker/cppumaker/singletons/LDBL_DIG.hpp"
-#include "test/codemaker/cppumaker/singletons/LDBL_EPSILON.hpp"
-#include "test/codemaker/cppumaker/singletons/LDBL_MANT_DIG.hpp"
-#include "test/codemaker/cppumaker/singletons/LDBL_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/LDBL_MAX_10_EXP.hpp"
-#include "test/codemaker/cppumaker/singletons/LDBL_MAX_EXP.hpp"
-#include "test/codemaker/cppumaker/singletons/LDBL_MIN.hpp"
-#include "test/codemaker/cppumaker/singletons/LDBL_MIN_10_EXP.hpp"
-#include "test/codemaker/cppumaker/singletons/LDBL_MIN_EXP.hpp"
-#include "test/codemaker/cppumaker/singletons/LONG_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/LONG_MIN.hpp"
-#include "test/codemaker/cppumaker/singletons/MB_LEN_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/SCHAR_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/SCHAR_MIN.hpp"
-#include "test/codemaker/cppumaker/singletons/SHRT_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/SHRT_MIN.hpp"
-#include "test/codemaker/cppumaker/singletons/UCHAR_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/UINT_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/ULONG_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/USHRT_MAX.hpp"
-#include "test/codemaker/cppumaker/singletons/FILE.hpp"
-#include "test/codemaker/cppumaker/singletons/lconv.hpp"
-#include "test/codemaker/cppumaker/singletons/tm.hpp"
-#include "test/codemaker/cppumaker/singletons/std.hpp"
-#include "test/codemaker/cppumaker/singletons/NDEBUG.hpp"
-#include "test/codemaker/cppumaker/singletons/get.hpp"
-#include "test/codemaker/cppumaker/HelperEnum.hpp"
-#include "test/codemaker/cppumaker/HelperStruct.hpp"
-#include "test/codemaker/cppumaker/BigStruct.hpp"
-#include "test/codemaker/cppumaker/Struct.hpp"
-#include "test/codemaker/cppumaker/StructUsage.hpp"
-#include "test/codemaker/cppumaker/AlignmentDerivedStruct.hpp"
-#include "test/codemaker/cppumaker/TestException1.hpp"
-#include "test/codemaker/cppumaker/TestException2.hpp"
-#include "test/codemaker/cppumaker/Constants.hpp"
-
-#include "boost/scoped_array.hpp"
-#include "com/sun/star/uno/Any.hxx"
-#include "com/sun/star/uno/Type.hxx"
-#include "com/sun/star/uno/TypeClass.hpp"
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
-
-#include <cstddef>
-#include <iostream>
-
-namespace {
-
-class Test: public CppUnit::TestFixture {
-public:
-    void testBigStruct();
-
-    void testPolyStruct();
-
-    void testExceptions();
-
-    void testConstants();
-
-    CPPUNIT_TEST_SUITE(Test);
-    CPPUNIT_TEST(testBigStruct);
-    CPPUNIT_TEST(testPolyStruct);
-    CPPUNIT_TEST(testExceptions);
-    CPPUNIT_TEST(testConstants);
-    CPPUNIT_TEST_SUITE_END();
-};
-
-struct Guard {
-    explicit Guard(void * buffer):
-        p(new(buffer) test::codemaker::cppumaker::BigStruct) {}
-
-    ~Guard() { p->test::codemaker::cppumaker::BigStruct::~BigStruct(); }
-
-    test::codemaker::cppumaker::BigStruct * const p;
-};
-
-void Test::testBigStruct() {
-    // Default-initialize a BigStruct instance on top of a memory buffer filled
-    // with random data, and make sure that all members are default-initialized:
-    boost::scoped_array< char > buffer(
-        new char[sizeof (test::codemaker::cppumaker::BigStruct)]);
-    for (std::size_t i = 0; i < sizeof (test::codemaker::cppumaker::BigStruct);
-         ++i)
-    {
-        buffer[i] = '\x56';
-    }
-    Guard guard(buffer.get());
-    CPPUNIT_ASSERT_EQUAL(guard.p->m1, sal_False);
-    CPPUNIT_ASSERT_EQUAL(guard.p->m2, static_cast< sal_Int8 >(0));
-    CPPUNIT_ASSERT_EQUAL(guard.p->m3, static_cast< sal_Int16 >(0));
-    CPPUNIT_ASSERT_EQUAL(guard.p->m4, static_cast< sal_uInt16 >(0));
-    CPPUNIT_ASSERT_EQUAL(guard.p->m5, static_cast< sal_Int32 >(0));
-    CPPUNIT_ASSERT_EQUAL(guard.p->m6, static_cast< sal_uInt32 >(0));
-    CPPUNIT_ASSERT_EQUAL(guard.p->m7, static_cast< sal_Int64 >(0));
-    CPPUNIT_ASSERT_EQUAL(guard.p->m8, static_cast< sal_uInt64 >(0));
-    CPPUNIT_ASSERT_EQUAL(guard.p->m9, 0.0f);
-    CPPUNIT_ASSERT_EQUAL(guard.p->m10, 0.0);
-    CPPUNIT_ASSERT_EQUAL(guard.p->m11, static_cast< sal_Unicode >(0));
-    CPPUNIT_ASSERT_EQUAL(guard.p->m12.getLength(), static_cast< sal_Int32 >(0));
-    CPPUNIT_ASSERT_EQUAL(
-        guard.p->m13.getTypeClass(), com::sun::star::uno::TypeClass_VOID);
-    CPPUNIT_ASSERT_EQUAL(guard.p->m14.hasValue(), sal_False);
-    CPPUNIT_ASSERT_EQUAL(guard.p->m15.getLength(), static_cast< sal_Int32 >(0));
-    CPPUNIT_ASSERT_EQUAL(
-        guard.p->m16, test::codemaker::cppumaker::HelperEnum_ZERO);
-    CPPUNIT_ASSERT_EQUAL(guard.p->m17.m1, sal_False);
-    CPPUNIT_ASSERT_EQUAL(guard.p->m17.m2.is(), sal_False);
-    CPPUNIT_ASSERT_EQUAL(guard.p->m18.is(), sal_False);
-    CPPUNIT_ASSERT_EQUAL(guard.p->m19, static_cast< sal_Int8 >(0));
-    CPPUNIT_ASSERT_EQUAL(
-        guard.p->m20, test::codemaker::cppumaker::HelperEnum_ZERO);
-    CPPUNIT_ASSERT_EQUAL(guard.p->m21.getLength(), static_cast< sal_Int32 >(0));
-    CPPUNIT_ASSERT_EQUAL(guard.p->m22.getLength(), static_cast< sal_Int32 >(0));
-    CPPUNIT_ASSERT_EQUAL(guard.p->m23.getLength(), static_cast< sal_Int32 >(0));
-
-#if defined __GNUC__ && __GNUC__ >= 3 // see CPPU_GCC3_ALIGN
-    CPPUNIT_ASSERT_EQUAL(
-#if defined X86_64
-        static_cast< std::size_t >(24),
-#else
-        static_cast< std::size_t >(16),
-#endif
-        sizeof (test::codemaker::cppumaker::AlignmentDerivedStruct));
-#endif
-
-    com::sun::star::uno::Type t(
-        cppu::UnoType< test::codemaker::cppumaker::BigStruct >::get());
-    typelib_TypeDescription * td = NULL;
-    t.getDescription(&td);
-    typelib_typedescription_complete(&td);
-    fprintf(stdout, "#### 1\n");
-    CPPUNIT_ASSERT(td != NULL);
-    CPPUNIT_ASSERT_EQUAL(typelib_TypeClass_STRUCT, td->eTypeClass);
-    typelib_StructTypeDescription * std =
-        reinterpret_cast< typelib_StructTypeDescription * >(td);
-    CPPUNIT_ASSERT_EQUAL(typelib_TypeClass_UNSIGNED_SHORT, std->aBase.ppTypeRefs[3]->eTypeClass); // unsigned short m4;
-    CPPUNIT_ASSERT_EQUAL(typelib_TypeClass_CHAR, std->aBase.ppTypeRefs[10]->eTypeClass); // char m11;
-}
-
-void Test::testPolyStruct() {
-    CPPUNIT_ASSERT_EQUAL(
-        rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM(
-                "test.codemaker.cppumaker.Struct<char,short>")),
-        (com::sun::star::uno::makeAny(
-            test::codemaker::cppumaker::Struct< sal_Unicode, sal_Int16 >()).
-         getValueType().getTypeName()));
-    CPPUNIT_ASSERT_EQUAL(
-        (test::codemaker::cppumaker::make_Struct< sal_uInt32, sal_Bool >(5, 0).
-         member1),
-        static_cast< sal_uInt32 >(5));
-}
-
-namespace {
-
-bool operator ==(
-    test::codemaker::cppumaker::TestException1 const & e1,
-    test::codemaker::cppumaker::TestException1 const & e2)
-{
-    return e1.Message == e2.Message && e1.Context == e2.Context
-        && e1.m1 == e2.m1 && e1.m2 == e2.m2 && e1.m3 == e2.m3
-        && e1.m4.member1 == e2.m4.member1 && e1.m4.member2 == e2.m4.member2;
-}
-
-std::ostream & operator <<(
-    std::ostream & out, com::sun::star::uno::Exception const &)
-{
-    return out << "<UNO exception>";
-}
-
-}
-
-void Test::testExceptions() {
-    test::codemaker::cppumaker::TestException1 e11(
-        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")), 0, 1,
-        com::sun::star::uno::makeAny(123.0),
-        test::codemaker::cppumaker::HelperEnum_ONE,
-        test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, 0), 2);
-    test::codemaker::cppumaker::TestException1 e12(e11);
-    CPPUNIT_ASSERT_EQUAL(e11, e12);
-    test::codemaker::cppumaker::TestException1 e13;
-    e13 = e11;
-    CPPUNIT_ASSERT_EQUAL(e11, e13);
-    test::codemaker::cppumaker::TestException2 e21(
-        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")), 0, 1,
-        com::sun::star::uno::makeAny(123.0),
-        test::codemaker::cppumaker::HelperEnum_ONE,
-        test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, 0), 2);
-    test::codemaker::cppumaker::TestException2 e22(e21);
-    CPPUNIT_ASSERT_EQUAL(e21, e22);
-    test::codemaker::cppumaker::TestException2 e23;
-    e23 = e21;
-    CPPUNIT_ASSERT_EQUAL(e21, e23);
-}
-
-void Test::testConstants() {
-    CPPUNIT_ASSERT_EQUAL(
-        SAL_MIN_INT8, test::codemaker::cppumaker::Constants::byteMin);
-    CPPUNIT_ASSERT_EQUAL(
-        SAL_MAX_INT8, test::codemaker::cppumaker::Constants::byteMax);
-    CPPUNIT_ASSERT_EQUAL(
-        static_cast< sal_Int8 >(-1),
-        test::codemaker::cppumaker::Constants::byteNeg);
-    CPPUNIT_ASSERT_EQUAL(
-        SAL_MIN_INT16, test::codemaker::cppumaker::Constants::shortMin);
-    CPPUNIT_ASSERT_EQUAL(
-        SAL_MAX_INT16, test::codemaker::cppumaker::Constants::shortMax);
-    CPPUNIT_ASSERT_EQUAL(
-        static_cast< sal_uInt16 >(0),
-        test::codemaker::cppumaker::Constants::unsignedShortMin);
-    CPPUNIT_ASSERT_EQUAL(
-        SAL_MAX_UINT16,
-        test::codemaker::cppumaker::Constants::unsignedShortMax);
-    CPPUNIT_ASSERT_EQUAL(
-        SAL_MIN_INT32, test::codemaker::cppumaker::Constants::longMin);
-    CPPUNIT_ASSERT_EQUAL(
-        SAL_MAX_INT32, test::codemaker::cppumaker::Constants::longMax);
-    CPPUNIT_ASSERT_EQUAL(
-        static_cast< sal_uInt32 >(0),
-        test::codemaker::cppumaker::Constants::unsignedLongMin);
-    CPPUNIT_ASSERT_EQUAL(
-        SAL_MAX_UINT32, test::codemaker::cppumaker::Constants::unsignedLongMax);
-    CPPUNIT_ASSERT_EQUAL(
-        SAL_MIN_INT64, test::codemaker::cppumaker::Constants::hyperMin);
-    CPPUNIT_ASSERT_EQUAL(
-        SAL_MAX_INT64, test::codemaker::cppumaker::Constants::hyperMax);
-    CPPUNIT_ASSERT_EQUAL(
-        static_cast< sal_uInt64 >(0),
-        test::codemaker::cppumaker::Constants::unsignedHyperMin);
-    CPPUNIT_ASSERT_EQUAL(
-        SAL_MAX_UINT64,
-        test::codemaker::cppumaker::Constants::unsignedHyperMax);
-}
-
-CPPUNIT_TEST_SUITE_REGISTRATION(Test);
-
-}
-
-CPPUNIT_PLUGIN_IMPLEMENT();
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/codemaker/test/cppumaker/types.idl b/codemaker/test/cppumaker/types.idl
deleted file mode 100644
index 20e2dad..0000000
--- a/codemaker/test/cppumaker/types.idl
+++ /dev/null
@@ -1,717 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-/*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"
-#include "com/sun/star/uno/DeploymentException.idl"
-#include "com/sun/star/uno/Exception.idl"
-#include "com/sun/star/uno/RuntimeException.idl"
-#include "com/sun/star/uno/XInterface.idl"
-#include "com/sun/star/uno/XNamingService.idl"
-
-singleton FILE: com::sun::star::uno::XInterface;
-singleton lconv: com::sun::star::uno::XInterface;
-singleton tm: com::sun::star::uno::XInterface;
-
-singleton std: com::sun::star::uno::XInterface;
-
-module test { module codemaker { module cppumaker {
-
-interface XTest {
-    boolean test();
-
-    [attribute, bound] long A1;
-    [attribute, bound, readonly] long A2;
-    [attribute] long A3 {
-        get raises
-            (com::sun::star::uno::Exception,
-             com::sun::star::lang::ClassNotFoundException);
-        set raises (com::sun::star::uno::RuntimeException);
-    };
-    [attribute, readonly] long A4 {
-        get raises (com::sun::star::uno::DeploymentException);
-    };
-};
-
-typedef boolean Boolean;
-typedef byte Byte;
-typedef short Short;
-typedef unsigned short UnsignedShort;
-typedef long Long;
-typedef unsigned long UnsignedLong;
-typedef hyper Hyper;
-typedef unsigned hyper UnsignedHyper;
-typedef float Float;
-typedef double Double;
-typedef char Char;
-typedef string String;
-typedef type Type;
-typedef any Any;
-typedef com::sun::star::lang::Locale Locale;
-typedef com::sun::star::uno::XInterface XInterface;
-typedef com::sun::star::uno::XNamingService XNamingService;
-
-typedef sequence< Boolean > SequenceBoolean;
-typedef sequence< Byte > SequenceByte;
-typedef sequence< Short > SequenceShort;
-typedef sequence< UnsignedShort > SequenceUnsignedShort;
-typedef sequence< Long > SequenceLong;
-typedef sequence< UnsignedLong > SequenceUnsignedLong;
-typedef sequence< Hyper > SequenceHyper;
-typedef sequence< UnsignedHyper > SequenceUnsignedHyper;
-typedef sequence< Float > SequenceFloat;
-typedef sequence< Double > SequenceDouble;
-typedef sequence< Char > SequenceChar;
-typedef sequence< String > SequenceString;
-typedef sequence< Type > SequenceType;
-typedef sequence< Any > SequenceAny;
-typedef sequence< Locale > SequenceLocale;
-typedef sequence< XInterface > SequenceXInterface;
-typedef sequence< XNamingService > SequenceXNamingService;
-
-service S1: XTest {
-    create1();
-
-    create2([in] any... create2)
-        raises (com::sun::star::uno::RuntimeException,
-                com::sun::star::lang::ClassNotFoundException,
-                com::sun::star::uno::Exception,
-                com::sun::star::lang::IllegalAccessException,
-                com::sun::star::uno::DeploymentException);
-
-    create3([in] sequence<any> S1)
-        raises (com::sun::star::uno::RuntimeException,
-                com::sun::star::lang::ClassNotFoundException,
-                com::sun::star::lang::IllegalAccessException,
-                com::sun::star::uno::DeploymentException);
-
-    create4([in] long javamaker, [in] long S1, [in] long create4);
-
-    create5(
-        [in] boolean p1,
-        [in] byte p2,
-        [in] short p3,
-        [in] unsigned short p4,
-        [in] long p5,
-        [in] unsigned long p6,
-        [in] hyper p7,
-        [in] unsigned hyper p8,
-        [in] float p9,
-        [in] double p10,
-        [in] char p11,
-        [in] string p12,
-        [in] type p13,
-        [in] any p14,
-        [in] com::sun::star::lang::Locale p15,
-        [in] com::sun::star::uno::XInterface p16,
-        [in] com::sun::star::uno::XNamingService p17,
-        [in] Boolean t1,
-        [in] Byte t2,
-        [in] Short t3,
-        [in] UnsignedShort t4,
-        [in] Long t5,
-        [in] UnsignedLong t6,
-        [in] Hyper t7,
-        [in] UnsignedHyper t8,
-        [in] Float t9,
-        [in] Double t10,
-        [in] Char t11,
-        [in] String t12,
-        [in] Type t13,
-        [in] Any t14,
-        [in] Locale t15,
-        [in] XInterface t16,
-        [in] XNamingService t17,
-        [in] sequence< sequence< boolean > > a1,
-        [in] sequence< sequence< byte > > a2,
-        [in] sequence< sequence< short > > a3,
-        [in] sequence< sequence< unsigned short > > a4,
-        [in] sequence< sequence< long > > a5,
-        [in] sequence< sequence< unsigned long > > a6,
-        [in] sequence< sequence< hyper > > a7,
-        [in] sequence< sequence< unsigned hyper > > a8,
-        [in] sequence< sequence< float > > a9,
-        [in] sequence< sequence< double > > a10,
-        [in] sequence< sequence< char > > a11,
-        [in] sequence< sequence< string > > a12,
-        [in] sequence< sequence< type > > a13,
-        [in] sequence< sequence< any > > a14,
-        [in] sequence< sequence< com::sun::star::lang::Locale > > a15,
-        [in] sequence< sequence< com::sun::star::uno::XInterface > > a16,
-        [in] sequence< sequence<
-            com::sun::star::uno::XNamingService > > a17,
-        [in] sequence< SequenceBoolean > at1,
-        [in] sequence< SequenceByte > at2,
-        [in] sequence< SequenceShort > at3,
-        [in] sequence< SequenceUnsignedShort > at4,
-        [in] sequence< SequenceLong > at5,
-        [in] sequence< SequenceUnsignedLong > at6,
-        [in] sequence< SequenceHyper > at7,
-        [in] sequence< SequenceUnsignedHyper > at8,
-        [in] sequence< SequenceFloat > at9,
-        [in] sequence< SequenceDouble > at10,
-        [in] sequence< SequenceChar > at11,
-        [in] sequence< SequenceString > at12,
-        [in] sequence< SequenceType > at13,
-        [in] sequence< SequenceAny > at14,
-        [in] sequence< SequenceLocale > at15,
-        [in] sequence< SequenceXInterface > at16,
-        [in] sequence< SequenceXNamingService > at17);
-};
-
-service S2: XTest;
-
-service S3 { interface XTest; };
-
-singleton S4 { service S2; };
-
-module services {
-
-service asm: com::sun::star::uno::XInterface { asm([in] long asm); };
-service auto: com::sun::star::uno::XInterface { auto([in] long auto); };
-service bool: com::sun::star::uno::XInterface { bool([in] long bool); };
-service break: com::sun::star::uno::XInterface { break([in] long break); };
-//TODO: service case: com::sun::star::uno::XInterface { case([in] long case); };
-service catch: com::sun::star::uno::XInterface { catch([in] long catch); };
-//TODO: service char: com::sun::star::uno::XInterface { char([in] long char); };
-service class: com::sun::star::uno::XInterface { class([in] long class); };
-//TODO: service const: com::sun::star::uno::XInterface {
-//    const([in] long const); };
-service continue: com::sun::star::uno::XInterface {
-    continue([in] long continue); };
-//TODO: service default: com::sun::star::uno::XInterface {
-//    default([in] long default); };
-service delete: com::sun::star::uno::XInterface { delete([in] long delete); };
-service do: com::sun::star::uno::XInterface { do([in] long do); };
-//TODO: service double: com::sun::star::uno::XInterface {
-//    double([in] long double); };
-service else: com::sun::star::uno::XInterface { else([in] long else); };
-//TODO: service enum: com::sun::star::uno::XInterface { enum([in] long enum); };
-service explicit: com::sun::star::uno::XInterface {
-    explicit([in] long explicit); };
-service export: com::sun::star::uno::XInterface { export([in] long export); };
-service extern: com::sun::star::uno::XInterface { extern([in] long extern); };
-service false: com::sun::star::uno::XInterface { false([in] long false); };
-//TODO: service float: com::sun::star::uno::XInterface {
-//    float([in] long float); };
-service for: com::sun::star::uno::XInterface { for([in] long for); };
-service friend: com::sun::star::uno::XInterface { friend([in] long friend); };
-service goto: com::sun::star::uno::XInterface { goto([in] long goto); };
-service if: com::sun::star::uno::XInterface { if([in] long if); };
-service inline: com::sun::star::uno::XInterface { inline([in] long inline); };
-service int: com::sun::star::uno::XInterface { int([in] long int); };
-//TODO: service long: com::sun::star::uno::XInterface { long([in] long long); };
-service mutable: com::sun::star::uno::XInterface {
-    mutable([in] long mutable); };
-service namespace: com::sun::star::uno::XInterface {
-    namespace([in] long namespace); };
-service new: com::sun::star::uno::XInterface { new([in] long new); };
-service operator: com::sun::star::uno::XInterface {
-    operator([in] long operator); };
-service private: com::sun::star::uno::XInterface {
-    private([in] long private); };
-service protected: com::sun::star::uno::XInterface {
-    protected([in] long protected); };
-service public: com::sun::star::uno::XInterface { public([in] long public); };
-service register: com::sun::star::uno::XInterface {
-    register([in] long register); };
-service return: com::sun::star::uno::XInterface { return([in] long return); };
-//TODO: service short: com::sun::star::uno::XInterface {
-//    short([in] long short); };
-service signed: com::sun::star::uno::XInterface { signed([in] long signed); };
-service sizeof: com::sun::star::uno::XInterface { sizeof([in] long sizeof); };
-service static: com::sun::star::uno::XInterface { static([in] long static); };
-//TODO: service struct: com::sun::star::uno::XInterface {
-//    struct([in] long struct); };
-//TODO: service switch: com::sun::star::uno::XInterface {
-//    switch([in] long switch); };
-service template: com::sun::star::uno::XInterface {
-    template([in] long template); };
-service this: com::sun::star::uno::XInterface { this([in] long this); };
-service throw: com::sun::star::uno::XInterface { throw([in] long throw); };
-service true: com::sun::star::uno::XInterface { true([in] long true); };
-service try: com::sun::star::uno::XInterface { try([in] long try); };
-//TODO: service typedef: com::sun::star::uno::XInterface {
-//    typedef([in] long typedef); };
-service typeid: com::sun::star::uno::XInterface { typeid([in] long typeid); };
-service typename: com::sun::star::uno::XInterface {
-    typename([in] long typename); };
-//TODO: service union: com::sun::star::uno::XInterface {
-//    union([in] long union); };
-//TODO: service unsigned: com::sun::star::uno::XInterface {
-//    unsigned([in] long unsigned); };
-service using: com::sun::star::uno::XInterface { using([in] long using); };
-service virtual: com::sun::star::uno::XInterface {
-    virtual([in] long virtual); };
-//TODO: service void: com::sun::star::uno::XInterface { void([in] long void); };
-service volatile: com::sun::star::uno::XInterface {
-    volatile([in] long volatile); };
-service while: com::sun::star::uno::XInterface { while([in] long while); };
-
-service and: com::sun::star::uno::XInterface { and([in] long and); };
-service bitand: com::sun::star::uno::XInterface { bitand([in] long bitand); };
-service bitor: com::sun::star::uno::XInterface { bitor([in] long bitor); };
-service compl: com::sun::star::uno::XInterface { compl([in] long compl); };
-service not: com::sun::star::uno::XInterface { not([in] long not); };
-service or: com::sun::star::uno::XInterface { or([in] long or); };
-service xor: com::sun::star::uno::XInterface { xor([in] long xor); };
-
-service BUFSIZ: com::sun::star::uno::XInterface { BUFSIZ([in] long BUFSIZ); };
-service CLOCKS_PER_SEC: com::sun::star::uno::XInterface {
-    CLOCKS_PER_SEC([in] long CLOCKS_PER_SEC); };
-service EDOM: com::sun::star::uno::XInterface { EDOM([in] long EDOM); };
-service EOF: com::sun::star::uno::XInterface { EOF([in] long EOF); };
-service ERANGE: com::sun::star::uno::XInterface { ERANGE([in] long ERANGE); };
-service EXIT_FAILURE: com::sun::star::uno::XInterface {
-    EXIT_FAILURE([in] long EXIT_FAILURE); };
-service EXIT_SUCCESS: com::sun::star::uno::XInterface {
-    EXIT_SUCCESS([in] long EXIT_SUCCESS); };
-service FILENAME_MAX: com::sun::star::uno::XInterface {
-    FILENAME_MAX([in] long FILENAME_MAX); };
-service FOPEN_MAX: com::sun::star::uno::XInterface {
-    FOPEN_MAX([in] long FOPEN_MAX); };
-service HUGE_VAL: com::sun::star::uno::XInterface {
-    HUGE_VAL([in] long HUGE_VAL); };
-service LC_ALL: com::sun::star::uno::XInterface { LC_ALL([in] long LC_ALL); };
-service LC_COLLATE: com::sun::star::uno::XInterface {
-    LC_COLLATE([in] long LC_COLLATE); };
-service LC_CTYPE: com::sun::star::uno::XInterface {
-    LC_CTYPE([in] long LC_CTYPE); };
-service LC_MONETARY: com::sun::star::uno::XInterface {
-    LC_MONETARY([in] long LC_MONETARY); };
-service LC_NUMERIC: com::sun::star::uno::XInterface {
-    LC_NUMERIC([in] long LC_NUMERIC); };
-service LC_TIME: com::sun::star::uno::XInterface {
-    LC_TIME([in] long LC_TIME); };
-service L_tmpnam: com::sun::star::uno::XInterface {
-    L_tmpnam([in] long L_tmpnam); };
-service MB_CUR_MAX: com::sun::star::uno::XInterface {
-    MB_CUR_MAX([in] long MB_CUR_MAX); };
-service NULL: com::sun::star::uno::XInterface { NULL([in] long NULL); };
-service RAND_MAX: com::sun::star::uno::XInterface {
-    RAND_MAX([in] long RAND_MAX); };
-service SEEK_CUR: com::sun::star::uno::XInterface {
-    SEEK_CUR([in] long SEEK_CUR); };
-service SEEK_END: com::sun::star::uno::XInterface {
-    SEEK_END([in] long SEEK_END); };
-service SEEK_SET: com::sun::star::uno::XInterface {
-    SEEK_SET([in] long SEEK_SET); };
-service SIGABRT: com::sun::star::uno::XInterface {
-    SIGABRT([in] long SIGABRT); };
-service SIGFPE: com::sun::star::uno::XInterface { SIGFPE([in] long SIGFPE); };
-service SIGILL: com::sun::star::uno::XInterface { SIGILL([in] long SIGILL); };
-service SIGINT: com::sun::star::uno::XInterface { SIGINT([in] long SIGINT); };
-service SIGSEGV: com::sun::star::uno::XInterface {
-    SIGSEGV([in] long SIGSEGV); };
-service SIGTERM: com::sun::star::uno::XInterface {
-    SIGTERM([in] long SIGTERM); };
-service SIG_DFL: com::sun::star::uno::XInterface {
-    SIG_DFL([in] long SIG_DFL); };
-service SIG_ERR: com::sun::star::uno::XInterface {
-    SIG_ERR([in] long SIG_ERR); };
-service SIG_IGN: com::sun::star::uno::XInterface {
-    SIG_IGN([in] long SIG_IGN); };
-service TMP_MAX: com::sun::star::uno::XInterface {
-    TMP_MAX([in] long TMP_MAX); };
-service WCHAR_MAX: com::sun::star::uno::XInterface {
-    WCHAR_MAX([in] long WCHAR_MAX); };
-service WCHAR_MIN: com::sun::star::uno::XInterface {
-    WCHAR_MIN([in] long WCHAR_MIN); };
-service WEOF: com::sun::star::uno::XInterface { WEOF([in] long WEOF); };
-service assert: com::sun::star::uno::XInterface { assert([in] long assert); };
-service errno: com::sun::star::uno::XInterface { errno([in] long errno); };
-service offsetof: com::sun::star::uno::XInterface {
-    offsetof([in] long offsetof); };
-service setjmp: com::sun::star::uno::XInterface { setjmp([in] long setjmp); };
-service stderr: com::sun::star::uno::XInterface { stderr([in] long stderr); };
-service stdin: com::sun::star::uno::XInterface { stdin([in] long stdin); };
-service stdout: com::sun::star::uno::XInterface { stdout([in] long stdout); };
-
-service CHAR_BIT: com::sun::star::uno::XInterface {
-    CHAR_BIT([in] long CHAR_BIT); };
-service CHAR_MAX: com::sun::star::uno::XInterface {
-    CHAR_MAX([in] long CHAR_MAX); };
-service CHAR_MIN: com::sun::star::uno::XInterface {
-    CHAR_MIN([in] long CHAR_MIN); };
-service DBL_DIG: com::sun::star::uno::XInterface {
-    DBL_DIG([in] long DBL_DIG); };
-service DBL_EPSILON: com::sun::star::uno::XInterface {
-    DBL_EPSILON([in] long DBL_EPSILON); };
-service DBL_MANT_DIG: com::sun::star::uno::XInterface {
-    DBL_MANT_DIG([in] long DBL_MANT_DIG); };
-service DBL_MAX: com::sun::star::uno::XInterface {
-    DBL_MAX([in] long DBL_MAX); };
-service DBL_MAX_10_EXP: com::sun::star::uno::XInterface {
-    DBL_MAX_10_EXP([in] long DBL_MAX_10_EXP); };
-service DBL_MAX_EXP: com::sun::star::uno::XInterface {
-    DBL_MAX_EXP([in] long DBL_MAX_EXP); };
-service DBL_MIN: com::sun::star::uno::XInterface {
-    DBL_MIN([in] long DBL_MIN); };
-service DBL_MIN_10_EXP: com::sun::star::uno::XInterface {
-    DBL_MIN_10_EXP([in] long DBL_MIN_10_EXP); };
-service DBL_MIN_EXP: com::sun::star::uno::XInterface {
-    DBL_MIN_EXP([in] long DBL_MIN_EXP); };
-service FLT_DIG: com::sun::star::uno::XInterface {
-    FLT_DIG([in] long FLT_DIG); };
-service FLT_EPSILON: com::sun::star::uno::XInterface {
-    FLT_EPSILON([in] long FLT_EPSILON); };
-service FLT_MANT_DIG: com::sun::star::uno::XInterface {
-    FLT_MANT_DIG([in] long FLT_MANT_DIG); };
-service FLT_MAX: com::sun::star::uno::XInterface {
-    FLT_MAX([in] long FLT_MAX); };
-service FLT_MAX_10_EXP: com::sun::star::uno::XInterface {
-    FLT_MAX_10_EXP([in] long FLT_MAX_10_EXP); };
-service FLT_MAX_EXP: com::sun::star::uno::XInterface {
-    FLT_MAX_EXP([in] long FLT_MAX_EXP); };
-service FLT_MIN: com::sun::star::uno::XInterface {
-    FLT_MIN([in] long FLT_MIN); };
-service FLT_MIN_10_EXP: com::sun::star::uno::XInterface {
-    FLT_MIN_10_EXP([in] long FLT_MIN_10_EXP); };
-service FLT_MIN_EXP: com::sun::star::uno::XInterface {
-    FLT_MIN_EXP([in] long FLT_MIN_EXP); };
-service FLT_RADIX: com::sun::star::uno::XInterface {
-    FLT_RADIX([in] long FLT_RADIX); };
-service FLT_ROUNDS: com::sun::star::uno::XInterface {
-    FLT_ROUNDS([in] long FLT_ROUNDS); };
-service INT_MAX: com::sun::star::uno::XInterface {
-    INT_MAX([in] long INT_MAX); };
-service INT_MIN: com::sun::star::uno::XInterface {
-    INT_MIN([in] long INT_MIN); };
-service LDBL_DIG: com::sun::star::uno::XInterface {
-    LDBL_DIG([in] long LDBL_DIG); };
-service LDBL_EPSILON: com::sun::star::uno::XInterface {
-    LDBL_EPSILON([in] long LDBL_EPSILON); };
-service LDBL_MANT_DIG: com::sun::star::uno::XInterface {
-    LDBL_MANT_DIG([in] long LDBL_MANT_DIG); };
-service LDBL_MAX: com::sun::star::uno::XInterface {
-    LDBL_MAX([in] long LDBL_MAX); };
-service LDBL_MAX_10_EXP: com::sun::star::uno::XInterface {
-    LDBL_MAX_10_EXP([in] long LDBL_MAX_10_EXP); };
-service LDBL_MAX_EXP: com::sun::star::uno::XInterface {
-    LDBL_MAX_EXP([in] long LDBL_MAX_EXP); };
-service LDBL_MIN: com::sun::star::uno::XInterface {
-    LDBL_MIN([in] long LDBL_MIN); };
-service LDBL_MIN_10_EXP: com::sun::star::uno::XInterface {
-    LDBL_MIN_10_EXP([in] long LDBL_MIN_10_EXP); };
-service LDBL_MIN_EXP: com::sun::star::uno::XInterface {
-    LDBL_MIN_EXP([in] long LDBL_MIN_EXP); };
-service LONG_MAX: com::sun::star::uno::XInterface {
-    LONG_MAX([in] long LONG_MAX); };
-service LONG_MIN: com::sun::star::uno::XInterface {
-    LONG_MIN([in] long LONG_MIN); };
-service MB_LEN_MAX: com::sun::star::uno::XInterface {
-    MB_LEN_MAX([in] long MB_LEN_MAX); };
-service SCHAR_MAX: com::sun::star::uno::XInterface {
-    SCHAR_MAX([in] long SCHAR_MAX); };
-service SCHAR_MIN: com::sun::star::uno::XInterface {
-    SCHAR_MIN([in] long SCHAR_MIN); };
-service SHRT_MAX: com::sun::star::uno::XInterface {
-    SHRT_MAX([in] long SHRT_MAX); };
-service SHRT_MIN: com::sun::star::uno::XInterface {
-    SHRT_MIN([in] long SHRT_MIN); };
-service UCHAR_MAX: com::sun::star::uno::XInterface {
-    UCHAR_MAX([in] long UCHAR_MAX); };
-service UINT_MAX: com::sun::star::uno::XInterface {
-    UINT_MAX([in] long UINT_MAX); };
-service ULONG_MAX: com::sun::star::uno::XInterface {
-    ULONG_MAX([in] long ULONG_MAX); };
-service USHRT_MAX: com::sun::star::uno::XInterface {
-    USHRT_MAX([in] long USHRT_MAX); };
-
-service FILE: com::sun::star::uno::XInterface { FILE([in] long FILE); };
-service lconv: com::sun::star::uno::XInterface { lconv([in] long lconv); };
-service tm: com::sun::star::uno::XInterface { tm([in] long tm); };
-
-service std: com::sun::star::uno::XInterface { std([in] long std); };
-
-service NDEBUG: com::sun::star::uno::XInterface { NDEBUG([in] long NDEBUG); };
-
-service create: com::sun::star::uno::XInterface;
-
-};
-
-module singletons {
-
-singleton asm: com::sun::star::uno::XInterface;
-singleton auto: com::sun::star::uno::XInterface;
-singleton bool: com::sun::star::uno::XInterface;
-singleton break: com::sun::star::uno::XInterface;
-//TODO: singleton case: com::sun::star::uno::XInterface;
-singleton catch: com::sun::star::uno::XInterface;
-//TODO: singleton char: com::sun::star::uno::XInterface;
-singleton class: com::sun::star::uno::XInterface;
-//TODO: singleton const: com::sun::star::uno::XInterface;
-singleton continue: com::sun::star::uno::XInterface;
-//TODO: singleton default: com::sun::star::uno::XInterface;
-singleton delete: com::sun::star::uno::XInterface;
-singleton do: com::sun::star::uno::XInterface;
-//TODO: singleton double: com::sun::star::uno::XInterface;
-singleton else: com::sun::star::uno::XInterface;
-//TODO: singleton enum: com::sun::star::uno::XInterface;
-singleton explicit: com::sun::star::uno::XInterface;
-singleton export: com::sun::star::uno::XInterface;
-singleton extern: com::sun::star::uno::XInterface;
-singleton false: com::sun::star::uno::XInterface;
-//TODO: singleton float: com::sun::star::uno::XInterface;
-singleton for: com::sun::star::uno::XInterface;
-singleton friend: com::sun::star::uno::XInterface;
-singleton goto: com::sun::star::uno::XInterface;
-singleton if: com::sun::star::uno::XInterface;
-singleton inline: com::sun::star::uno::XInterface;
-singleton int: com::sun::star::uno::XInterface;
-//TODO: singleton long: com::sun::star::uno::XInterface;
-singleton mutable: com::sun::star::uno::XInterface;
-singleton namespace: com::sun::star::uno::XInterface;
-singleton new: com::sun::star::uno::XInterface;
-singleton operator: com::sun::star::uno::XInterface;
-singleton private: com::sun::star::uno::XInterface;
-singleton protected: com::sun::star::uno::XInterface;
-singleton public: com::sun::star::uno::XInterface;
-singleton register: com::sun::star::uno::XInterface;
-singleton return: com::sun::star::uno::XInterface;
-//TODO: singleton short: com::sun::star::uno::XInterface;
-singleton signed: com::sun::star::uno::XInterface;
-singleton sizeof: com::sun::star::uno::XInterface;
-singleton static: com::sun::star::uno::XInterface;
-//TODO: singleton struct: com::sun::star::uno::XInterface;
-//TODO: singleton switch: com::sun::star::uno::XInterface;
-singleton template: com::sun::star::uno::XInterface;
-singleton this: com::sun::star::uno::XInterface;
-singleton throw: com::sun::star::uno::XInterface;
-singleton true: com::sun::star::uno::XInterface;
-singleton try: com::sun::star::uno::XInterface;
-//TODO: singleton typedef: com::sun::star::uno::XInterface;
-singleton typeid: com::sun::star::uno::XInterface;
-singleton typename: com::sun::star::uno::XInterface;
-//TODO: singleton union: com::sun::star::uno::XInterface;
-//TODO: singleton unsigned: com::sun::star::uno::XInterface;
-singleton using: com::sun::star::uno::XInterface;
-singleton virtual: com::sun::star::uno::XInterface;
-//TODO: singleton void: com::sun::star::uno::XInterface;
-singleton volatile: com::sun::star::uno::XInterface;
-singleton while: com::sun::star::uno::XInterface;
-
-singleton and: com::sun::star::uno::XInterface;
-singleton bitand: com::sun::star::uno::XInterface;
-singleton bitor: com::sun::star::uno::XInterface;
-singleton compl: com::sun::star::uno::XInterface;
-singleton not: com::sun::star::uno::XInterface;
-singleton or: com::sun::star::uno::XInterface;
-singleton xor: com::sun::star::uno::XInterface;
-
-singleton BUFSIZ: com::sun::star::uno::XInterface;
-singleton CLOCKS_PER_SEC: com::sun::star::uno::XInterface;
-singleton EDOM: com::sun::star::uno::XInterface;
-singleton EOF: com::sun::star::uno::XInterface;
-singleton ERANGE: com::sun::star::uno::XInterface;
-singleton EXIT_FAILURE: com::sun::star::uno::XInterface;
-singleton EXIT_SUCCESS: com::sun::star::uno::XInterface;
-singleton FILENAME_MAX: com::sun::star::uno::XInterface;
-singleton FOPEN_MAX: com::sun::star::uno::XInterface;
-singleton HUGE_VAL: com::sun::star::uno::XInterface;
-singleton LC_ALL: com::sun::star::uno::XInterface;
-singleton LC_COLLATE: com::sun::star::uno::XInterface;
-singleton LC_CTYPE: com::sun::star::uno::XInterface;
-singleton LC_MONETARY: com::sun::star::uno::XInterface;
-singleton LC_NUMERIC: com::sun::star::uno::XInterface;
-singleton LC_TIME: com::sun::star::uno::XInterface;
-singleton L_tmpnam: com::sun::star::uno::XInterface;
-singleton MB_CUR_MAX: com::sun::star::uno::XInterface;
-singleton NULL: com::sun::star::uno::XInterface;
-singleton RAND_MAX: com::sun::star::uno::XInterface;
-singleton SEEK_CUR: com::sun::star::uno::XInterface;
-singleton SEEK_END: com::sun::star::uno::XInterface;
-singleton SEEK_SET: com::sun::star::uno::XInterface;
-singleton SIGABRT: com::sun::star::uno::XInterface;
-singleton SIGFPE: com::sun::star::uno::XInterface;
-singleton SIGILL: com::sun::star::uno::XInterface;
-singleton SIGINT: com::sun::star::uno::XInterface;
-singleton SIGSEGV: com::sun::star::uno::XInterface;
-singleton SIGTERM: com::sun::star::uno::XInterface;
-singleton SIG_DFL: com::sun::star::uno::XInterface;
-singleton SIG_ERR: com::sun::star::uno::XInterface;
-singleton SIG_IGN: com::sun::star::uno::XInterface;
-singleton TMP_MAX: com::sun::star::uno::XInterface;
-singleton WCHAR_MAX: com::sun::star::uno::XInterface;
-singleton WCHAR_MIN: com::sun::star::uno::XInterface;
-singleton WEOF: com::sun::star::uno::XInterface;
-singleton assert: com::sun::star::uno::XInterface;
-singleton errno: com::sun::star::uno::XInterface;
-singleton offsetof: com::sun::star::uno::XInterface;
-singleton setjmp: com::sun::star::uno::XInterface;
-singleton stderr: com::sun::star::uno::XInterface;
-singleton stdin: com::sun::star::uno::XInterface;
-singleton stdout: com::sun::star::uno::XInterface;
-
-singleton CHAR_BIT: com::sun::star::uno::XInterface;
-singleton CHAR_MAX: com::sun::star::uno::XInterface;
-singleton CHAR_MIN: com::sun::star::uno::XInterface;
-singleton DBL_DIG: com::sun::star::uno::XInterface;
-singleton DBL_EPSILON: com::sun::star::uno::XInterface;
-singleton DBL_MANT_DIG: com::sun::star::uno::XInterface;
-singleton DBL_MAX: com::sun::star::uno::XInterface;
-singleton DBL_MAX_10_EXP: com::sun::star::uno::XInterface;
-singleton DBL_MAX_EXP: com::sun::star::uno::XInterface;
-singleton DBL_MIN: com::sun::star::uno::XInterface;
-singleton DBL_MIN_10_EXP: com::sun::star::uno::XInterface;
-singleton DBL_MIN_EXP: com::sun::star::uno::XInterface;
-singleton FLT_DIG: com::sun::star::uno::XInterface;
-singleton FLT_EPSILON: com::sun::star::uno::XInterface;
-singleton FLT_MANT_DIG: com::sun::star::uno::XInterface;
-singleton FLT_MAX: com::sun::star::uno::XInterface;
-singleton FLT_MAX_10_EXP: com::sun::star::uno::XInterface;
-singleton FLT_MAX_EXP: com::sun::star::uno::XInterface;
-singleton FLT_MIN: com::sun::star::uno::XInterface;
-singleton FLT_MIN_10_EXP: com::sun::star::uno::XInterface;
-singleton FLT_MIN_EXP: com::sun::star::uno::XInterface;
-singleton FLT_RADIX: com::sun::star::uno::XInterface;
-singleton FLT_ROUNDS: com::sun::star::uno::XInterface;
-singleton INT_MAX: com::sun::star::uno::XInterface;
-singleton INT_MIN: com::sun::star::uno::XInterface;
-singleton LDBL_DIG: com::sun::star::uno::XInterface;
-singleton LDBL_EPSILON: com::sun::star::uno::XInterface;
-singleton LDBL_MANT_DIG: com::sun::star::uno::XInterface;
-singleton LDBL_MAX: com::sun::star::uno::XInterface;
-singleton LDBL_MAX_10_EXP: com::sun::star::uno::XInterface;
-singleton LDBL_MAX_EXP: com::sun::star::uno::XInterface;
-singleton LDBL_MIN: com::sun::star::uno::XInterface;
-singleton LDBL_MIN_10_EXP: com::sun::star::uno::XInterface;
-singleton LDBL_MIN_EXP: com::sun::star::uno::XInterface;
-singleton LONG_MAX: com::sun::star::uno::XInterface;
-singleton LONG_MIN: com::sun::star::uno::XInterface;
-singleton MB_LEN_MAX: com::sun::star::uno::XInterface;
-singleton SCHAR_MAX: com::sun::star::uno::XInterface;
-singleton SCHAR_MIN: com::sun::star::uno::XInterface;
-singleton SHRT_MAX: com::sun::star::uno::XInterface;
-singleton SHRT_MIN: com::sun::star::uno::XInterface;
-singleton UCHAR_MAX: com::sun::star::uno::XInterface;
-singleton UINT_MAX: com::sun::star::uno::XInterface;
-singleton ULONG_MAX: com::sun::star::uno::XInterface;
-singleton USHRT_MAX: com::sun::star::uno::XInterface;
-
-singleton FILE: com::sun::star::uno::XInterface;
-singleton lconv: com::sun::star::uno::XInterface;
-singleton tm: com::sun::star::uno::XInterface;
-
-singleton std: com::sun::star::uno::XInterface;
-
-singleton NDEBUG: com::sun::star::uno::XInterface;
-
-singleton get: com::sun::star::uno::XInterface;
-
-};
-
-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;
-    sequence<unsigned short> m21;
-    sequence<char> m22;
-    sequence< sequence<char> > m23;
-};
-
-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;
-};
-
-exception TestException1: com::sun::star::uno::RuntimeException {
-    long m1;
-    any m2;
-    HelperEnum m3;
-    Struct<long, long> m4;
-    unsigned short m5;
-};
-
-exception TestException2: TestException1 {};
-
-constants Constants {
-    const byte byteMin = -128;
-    const byte byteMax = 127;
-    const byte byteNeg = 255;
-    const short shortMin = -32768;
-    const short shortMax = 32767;
-    const unsigned short unsignedShortMin = 0;
-    const unsigned short unsignedShortMax = 65535;
-    const long longMin = -2147483648;
-    const long longMax = 2147483647;
-    const unsigned long unsignedLongMin = 0;
-    const unsigned long unsignedLongMax = 4294967295;
-    const hyper hyperMin = -9223372036854775808;
-    const hyper hyperMax = 9223372036854775807;
-    const unsigned hyper unsignedHyperMin = 0;
-    const unsigned hyper unsignedHyperMax = 18446744073709551615;
-};
-
-}; }; };
diff --git a/codemaker/test/cppumaker/version.map b/codemaker/test/cppumaker/version.map
deleted file mode 100644
index 0dbbcc5..0000000
--- a/codemaker/test/cppumaker/version.map
+++ /dev/null
@@ -1,34 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-UDK_3_0_0 {
-    global:
-        cppunitTestPlugIn;
-
-    local:
-        *;
-};
diff --git a/cppu/prj/build.lst b/cppu/prj/build.lst
index 4ded629..62ddfff 100644
--- a/cppu/prj/build.lst
+++ b/cppu/prj/build.lst
@@ -10,4 +10,5 @@ cu	cppu\source\UnsafeBridge	    nmake	-	all	cu_UnsafeBridge cu_inc NULL
 cu	cppu\source\AffineBridge	    nmake	-	all	cu_AffineBridge cu_inc NULL
 cu	cppu\source\LogBridge	        nmake	-	all	cu_LogBridge cu_inc NULL
 cu	cppu\util						nmake	-	all	cu_util cu_thpool cu_typelib cu_cppu cu_uno cu_helper_purpenv cu_UnsafeBridge cu_AffineBridge cu_LogBridge NULL
-cd	cppu\qa							nmake	-	all cu_qa_cppunit cu_util NULL
+cu	cppu\qa							nmake	-	all cu_qa_cppunit cu_util NULL
+cu	cppu\qa\cppumaker				nmake	-	all cu_qa_cppumaker cu_inc NULL
diff --git a/cppu/qa/cppumaker/makefile.mk b/cppu/qa/cppumaker/makefile.mk
new file mode 100644
index 0000000..1dd1a4b
--- /dev/null
+++ b/cppu/qa/cppumaker/makefile.mk
@@ -0,0 +1,72 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ := ..$/..
+PRJNAME := cppu
+TARGET := test_cppumaker
+
+ENABLE_EXCEPTIONS := TRUE
+
+.INCLUDE: settings.mk
+
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
+
+DLLPRE = # no leading "lib" on .so files
+
+INCPRE += $(MISC)$/$(TARGET)$/inc
+
+SHL1TARGET = $(TARGET)
+SHL1OBJS = $(SLO)$/test_cppumaker.obj
+SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
+SHL1VERSIONMAP = version.map
+SHL1IMPLIB = i$(SHL1TARGET)
+DEF1NAME = $(SHL1TARGET)
+
+SLOFILES = $(SHL1OBJS)
+
+.INCLUDE: target.mk
+
+ALLTAR: test
+
+$(SHL1OBJS): $(MISC)$/$(TARGET).cppumaker.flag
+
+$(MISC)$/$(TARGET).cppumaker.flag: $(MISC)$/$(TARGET).rdb
+    - $(MKDIRHIER) $(MISC)$/$(TARGET)$/inc
+    $(CPPUMAKER) \
+        -O$(MISC)$/$(TARGET)$/inc -BUCR -C $< $(SOLARBINDIR)$/udkapi.rdb
+    $(TOUCH) $@
+
+$(MISC)$/$(TARGET).rdb: $(MISC)$/$(TARGET)$/types.urd
+    - rm $@
+    $(REGMERGE) $@ /UCR $<
+
+$(MISC)$/$(TARGET)$/types.urd: types.idl
+    - $(MKDIR) $(MISC)$/$(TARGET)
+    $(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $<
+
+test .PHONY: $(SHL1TARGETN)
+    $(CPPUNITTESTER) $<
diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx
new file mode 100644
index 0000000..75f3669
--- /dev/null
+++ b/cppu/qa/cppumaker/test_cppumaker.cxx
@@ -0,0 +1,572 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_cppu.hxx"
+
+#include "FILE.hpp"
+#include "lconv.hpp"
+#include "tm.hpp"
+#include "std.hpp"
+#include "test/codemaker/cppumaker/XTest.hpp"
+#include "test/codemaker/cppumaker/S1.hpp"
+#include "test/codemaker/cppumaker/services/asm.hpp"
+#include "test/codemaker/cppumaker/services/auto.hpp"
+#include "test/codemaker/cppumaker/services/bool.hpp"
+#include "test/codemaker/cppumaker/services/break.hpp"
+//TODO: #include "test/codemaker/cppumaker/services/case.hpp"
+#include "test/codemaker/cppumaker/services/catch.hpp"
+//TODO: #include "test/codemaker/cppumaker/services/char.hpp"
+#include "test/codemaker/cppumaker/services/class.hpp"
+//TODO: #include "test/codemaker/cppumaker/services/const.hpp"
+#include "test/codemaker/cppumaker/services/continue.hpp"
+//TODO: #include "test/codemaker/cppumaker/services/default.hpp"
+#include "test/codemaker/cppumaker/services/delete.hpp"
+#include "test/codemaker/cppumaker/services/do.hpp"
+//TODO: #include "test/codemaker/cppumaker/services/double.hpp"
+#include "test/codemaker/cppumaker/services/else.hpp"
+//TODO: #include "test/codemaker/cppumaker/services/enum.hpp"
+#include "test/codemaker/cppumaker/services/explicit.hpp"
+#include "test/codemaker/cppumaker/services/export.hpp"
+#include "test/codemaker/cppumaker/services/extern.hpp"
+#include "test/codemaker/cppumaker/services/false.hpp"
+//TODO: #include "test/codemaker/cppumaker/services/float.hpp"
+#include "test/codemaker/cppumaker/services/for.hpp"
+#include "test/codemaker/cppumaker/services/friend.hpp"
+#include "test/codemaker/cppumaker/services/goto.hpp"
+#include "test/codemaker/cppumaker/services/if.hpp"
+#include "test/codemaker/cppumaker/services/inline.hpp"
+#include "test/codemaker/cppumaker/services/int.hpp"
+//TODO: #include "test/codemaker/cppumaker/services/long.hpp"
+#include "test/codemaker/cppumaker/services/mutable.hpp"
+#include "test/codemaker/cppumaker/services/namespace.hpp"
+#include "test/codemaker/cppumaker/services/new.hpp"
+#include "test/codemaker/cppumaker/services/operator.hpp"
+#include "test/codemaker/cppumaker/services/private.hpp"
+#include "test/codemaker/cppumaker/services/protected.hpp"
+#include "test/codemaker/cppumaker/services/public.hpp"
+#include "test/codemaker/cppumaker/services/register.hpp"
+#include "test/codemaker/cppumaker/services/return.hpp"
+//TODO: #include "test/codemaker/cppumaker/services/short.hpp"
+#include "test/codemaker/cppumaker/services/signed.hpp"
+#include "test/codemaker/cppumaker/services/sizeof.hpp"
+#include "test/codemaker/cppumaker/services/static.hpp"
+//TODO: #include "test/codemaker/cppumaker/services/struct.hpp"
+//TODO: #include "test/codemaker/cppumaker/services/switch.hpp"
+#include "test/codemaker/cppumaker/services/template.hpp"
+#include "test/codemaker/cppumaker/services/this.hpp"
+#include "test/codemaker/cppumaker/services/throw.hpp"
+#include "test/codemaker/cppumaker/services/true.hpp"
+#include "test/codemaker/cppumaker/services/try.hpp"
+//TODO: #include "test/codemaker/cppumaker/services/typedef.hpp"
+#include "test/codemaker/cppumaker/services/typeid.hpp"
+#include "test/codemaker/cppumaker/services/typename.hpp"
+//TODO: #include "test/codemaker/cppumaker/services/union.hpp"
+//TODO: #include "test/codemaker/cppumaker/services/unsigned.hpp"
+#include "test/codemaker/cppumaker/services/using.hpp"
+#include "test/codemaker/cppumaker/services/virtual.hpp"
+//TODO: #include "test/codemaker/cppumaker/services/void.hpp"
+#include "test/codemaker/cppumaker/services/volatile.hpp"
+#include "test/codemaker/cppumaker/services/while.hpp"
+#include "test/codemaker/cppumaker/services/and.hpp"
+#include "test/codemaker/cppumaker/services/bitand.hpp"
+#include "test/codemaker/cppumaker/services/bitor.hpp"
+#include "test/codemaker/cppumaker/services/compl.hpp"
+#include "test/codemaker/cppumaker/services/not.hpp"
+#include "test/codemaker/cppumaker/services/or.hpp"
+#include "test/codemaker/cppumaker/services/xor.hpp"
+#include "test/codemaker/cppumaker/services/BUFSIZ.hpp"
+#include "test/codemaker/cppumaker/services/CLOCKS_PER_SEC.hpp"
+#include "test/codemaker/cppumaker/services/EDOM.hpp"
+#include "test/codemaker/cppumaker/services/EOF.hpp"
+#include "test/codemaker/cppumaker/services/ERANGE.hpp"
+#include "test/codemaker/cppumaker/services/EXIT_FAILURE.hpp"
+#include "test/codemaker/cppumaker/services/EXIT_SUCCESS.hpp"
+#include "test/codemaker/cppumaker/services/FILENAME_MAX.hpp"
+#include "test/codemaker/cppumaker/services/FOPEN_MAX.hpp"
+#include "test/codemaker/cppumaker/services/HUGE_VAL.hpp"
+#include "test/codemaker/cppumaker/services/LC_ALL.hpp"
+#include "test/codemaker/cppumaker/services/LC_COLLATE.hpp"
+#include "test/codemaker/cppumaker/services/LC_CTYPE.hpp"
+#include "test/codemaker/cppumaker/services/LC_MONETARY.hpp"
+#include "test/codemaker/cppumaker/services/LC_NUMERIC.hpp"
+#include "test/codemaker/cppumaker/services/LC_TIME.hpp"
+#include "test/codemaker/cppumaker/services/L_tmpnam.hpp"
+#include "test/codemaker/cppumaker/services/MB_CUR_MAX.hpp"
+#include "test/codemaker/cppumaker/services/NULL.hpp"
+#include "test/codemaker/cppumaker/services/RAND_MAX.hpp"
+#include "test/codemaker/cppumaker/services/SEEK_CUR.hpp"
+#include "test/codemaker/cppumaker/services/SEEK_END.hpp"
+#include "test/codemaker/cppumaker/services/SEEK_SET.hpp"
+#include "test/codemaker/cppumaker/services/SIGABRT.hpp"
+#include "test/codemaker/cppumaker/services/SIGFPE.hpp"
+#include "test/codemaker/cppumaker/services/SIGILL.hpp"
+#include "test/codemaker/cppumaker/services/SIGINT.hpp"
+#include "test/codemaker/cppumaker/services/SIGSEGV.hpp"
+#include "test/codemaker/cppumaker/services/SIGTERM.hpp"
+#include "test/codemaker/cppumaker/services/SIG_DFL.hpp"
+#include "test/codemaker/cppumaker/services/SIG_ERR.hpp"
+#include "test/codemaker/cppumaker/services/SIG_IGN.hpp"
+#include "test/codemaker/cppumaker/services/TMP_MAX.hpp"
+#include "test/codemaker/cppumaker/services/WCHAR_MAX.hpp"
+#include "test/codemaker/cppumaker/services/WCHAR_MIN.hpp"
+#include "test/codemaker/cppumaker/services/WEOF.hpp"
+#include "test/codemaker/cppumaker/services/assert.hpp"
+#include "test/codemaker/cppumaker/services/errno.hpp"
+#include "test/codemaker/cppumaker/services/offsetof.hpp"
+#include "test/codemaker/cppumaker/services/setjmp.hpp"
+#include "test/codemaker/cppumaker/services/stderr.hpp"
+#include "test/codemaker/cppumaker/services/stdin.hpp"
+#include "test/codemaker/cppumaker/services/stdout.hpp"
+#include "test/codemaker/cppumaker/services/CHAR_BIT.hpp"
+#include "test/codemaker/cppumaker/services/CHAR_MAX.hpp"
+#include "test/codemaker/cppumaker/services/CHAR_MIN.hpp"
+#include "test/codemaker/cppumaker/services/DBL_DIG.hpp"
+#include "test/codemaker/cppumaker/services/DBL_EPSILON.hpp"
+#include "test/codemaker/cppumaker/services/DBL_MANT_DIG.hpp"
+#include "test/codemaker/cppumaker/services/DBL_MAX.hpp"
+#include "test/codemaker/cppumaker/services/DBL_MAX_10_EXP.hpp"
+#include "test/codemaker/cppumaker/services/DBL_MAX_EXP.hpp"
+#include "test/codemaker/cppumaker/services/DBL_MIN.hpp"
+#include "test/codemaker/cppumaker/services/DBL_MIN_10_EXP.hpp"
+#include "test/codemaker/cppumaker/services/DBL_MIN_EXP.hpp"
+#include "test/codemaker/cppumaker/services/FLT_DIG.hpp"
+#include "test/codemaker/cppumaker/services/FLT_EPSILON.hpp"
+#include "test/codemaker/cppumaker/services/FLT_MANT_DIG.hpp"
+#include "test/codemaker/cppumaker/services/FLT_MAX.hpp"
+#include "test/codemaker/cppumaker/services/FLT_MAX_10_EXP.hpp"
+#include "test/codemaker/cppumaker/services/FLT_MAX_EXP.hpp"
+#include "test/codemaker/cppumaker/services/FLT_MIN.hpp"
+#include "test/codemaker/cppumaker/services/FLT_MIN_10_EXP.hpp"
+#include "test/codemaker/cppumaker/services/FLT_MIN_EXP.hpp"
+#include "test/codemaker/cppumaker/services/FLT_RADIX.hpp"
+#include "test/codemaker/cppumaker/services/FLT_ROUNDS.hpp"
+#include "test/codemaker/cppumaker/services/INT_MAX.hpp"
+#include "test/codemaker/cppumaker/services/INT_MIN.hpp"
+#include "test/codemaker/cppumaker/services/LDBL_DIG.hpp"
+#include "test/codemaker/cppumaker/services/LDBL_EPSILON.hpp"
+#include "test/codemaker/cppumaker/services/LDBL_MANT_DIG.hpp"
+#include "test/codemaker/cppumaker/services/LDBL_MAX.hpp"
+#include "test/codemaker/cppumaker/services/LDBL_MAX_10_EXP.hpp"
+#include "test/codemaker/cppumaker/services/LDBL_MAX_EXP.hpp"
+#include "test/codemaker/cppumaker/services/LDBL_MIN.hpp"
+#include "test/codemaker/cppumaker/services/LDBL_MIN_10_EXP.hpp"
+#include "test/codemaker/cppumaker/services/LDBL_MIN_EXP.hpp"
+#include "test/codemaker/cppumaker/services/LONG_MAX.hpp"
+#include "test/codemaker/cppumaker/services/LONG_MIN.hpp"
+#include "test/codemaker/cppumaker/services/MB_LEN_MAX.hpp"
+#include "test/codemaker/cppumaker/services/SCHAR_MAX.hpp"
+#include "test/codemaker/cppumaker/services/SCHAR_MIN.hpp"
+#include "test/codemaker/cppumaker/services/SHRT_MAX.hpp"
+#include "test/codemaker/cppumaker/services/SHRT_MIN.hpp"
+#include "test/codemaker/cppumaker/services/UCHAR_MAX.hpp"
+#include "test/codemaker/cppumaker/services/UINT_MAX.hpp"
+#include "test/codemaker/cppumaker/services/ULONG_MAX.hpp"
+#include "test/codemaker/cppumaker/services/USHRT_MAX.hpp"
+#include "test/codemaker/cppumaker/services/FILE.hpp"
+#include "test/codemaker/cppumaker/services/lconv.hpp"
+#include "test/codemaker/cppumaker/services/tm.hpp"
+#include "test/codemaker/cppumaker/services/std.hpp"
+#include "test/codemaker/cppumaker/services/NDEBUG.hpp"
+#include "test/codemaker/cppumaker/services/create.hpp"
+#include "test/codemaker/cppumaker/singletons/asm.hpp"
+#include "test/codemaker/cppumaker/singletons/auto.hpp"
+#include "test/codemaker/cppumaker/singletons/bool.hpp"
+#include "test/codemaker/cppumaker/singletons/break.hpp"
+//TODO: #include "test/codemaker/cppumaker/singletons/case.hpp"
+#include "test/codemaker/cppumaker/singletons/catch.hpp"
+//TODO: #include "test/codemaker/cppumaker/singletons/char.hpp"
+#include "test/codemaker/cppumaker/singletons/class.hpp"
+//TODO: #include "test/codemaker/cppumaker/singletons/const.hpp"
+#include "test/codemaker/cppumaker/singletons/continue.hpp"
+//TODO: #include "test/codemaker/cppumaker/singletons/default.hpp"
+#include "test/codemaker/cppumaker/singletons/delete.hpp"
+#include "test/codemaker/cppumaker/singletons/do.hpp"
+//TODO: #include "test/codemaker/cppumaker/singletons/double.hpp"
+#include "test/codemaker/cppumaker/singletons/else.hpp"
+//TODO: #include "test/codemaker/cppumaker/singletons/enum.hpp"
+#include "test/codemaker/cppumaker/singletons/explicit.hpp"
+#include "test/codemaker/cppumaker/singletons/export.hpp"
+#include "test/codemaker/cppumaker/singletons/extern.hpp"
+#include "test/codemaker/cppumaker/singletons/false.hpp"
+//TODO: #include "test/codemaker/cppumaker/singletons/float.hpp"
+#include "test/codemaker/cppumaker/singletons/for.hpp"
+#include "test/codemaker/cppumaker/singletons/friend.hpp"
+#include "test/codemaker/cppumaker/singletons/goto.hpp"
+#include "test/codemaker/cppumaker/singletons/if.hpp"
+#include "test/codemaker/cppumaker/singletons/inline.hpp"
+#include "test/codemaker/cppumaker/singletons/int.hpp"
+//TODO: #include "test/codemaker/cppumaker/singletons/long.hpp"
+#include "test/codemaker/cppumaker/singletons/mutable.hpp"
+#include "test/codemaker/cppumaker/singletons/namespace.hpp"
+#include "test/codemaker/cppumaker/singletons/new.hpp"
+#include "test/codemaker/cppumaker/singletons/operator.hpp"
+#include "test/codemaker/cppumaker/singletons/private.hpp"
+#include "test/codemaker/cppumaker/singletons/protected.hpp"
+#include "test/codemaker/cppumaker/singletons/public.hpp"
+#include "test/codemaker/cppumaker/singletons/register.hpp"
+#include "test/codemaker/cppumaker/singletons/return.hpp"
+//TODO: #include "test/codemaker/cppumaker/singletons/short.hpp"
+#include "test/codemaker/cppumaker/singletons/signed.hpp"
+#include "test/codemaker/cppumaker/singletons/sizeof.hpp"
+#include "test/codemaker/cppumaker/singletons/static.hpp"
+//TODO: #include "test/codemaker/cppumaker/singletons/struct.hpp"
+//TODO: #include "test/codemaker/cppumaker/singletons/switch.hpp"
+#include "test/codemaker/cppumaker/singletons/template.hpp"
+#include "test/codemaker/cppumaker/singletons/this.hpp"
+#include "test/codemaker/cppumaker/singletons/throw.hpp"
+#include "test/codemaker/cppumaker/singletons/true.hpp"
+#include "test/codemaker/cppumaker/singletons/try.hpp"
+//TODO: #include "test/codemaker/cppumaker/singletons/typedef.hpp"
+#include "test/codemaker/cppumaker/singletons/typeid.hpp"
+#include "test/codemaker/cppumaker/singletons/typename.hpp"
+//TODO: #include "test/codemaker/cppumaker/singletons/union.hpp"
+//TODO: #include "test/codemaker/cppumaker/singletons/unsigned.hpp"
+#include "test/codemaker/cppumaker/singletons/using.hpp"
+#include "test/codemaker/cppumaker/singletons/virtual.hpp"
+//TODO: #include "test/codemaker/cppumaker/singletons/void.hpp"
+#include "test/codemaker/cppumaker/singletons/volatile.hpp"
+#include "test/codemaker/cppumaker/singletons/while.hpp"
+#include "test/codemaker/cppumaker/singletons/and.hpp"
+#include "test/codemaker/cppumaker/singletons/bitand.hpp"
+#include "test/codemaker/cppumaker/singletons/bitor.hpp"
+#include "test/codemaker/cppumaker/singletons/compl.hpp"
+#include "test/codemaker/cppumaker/singletons/not.hpp"
+#include "test/codemaker/cppumaker/singletons/or.hpp"
+#include "test/codemaker/cppumaker/singletons/xor.hpp"
+#include "test/codemaker/cppumaker/singletons/BUFSIZ.hpp"
+#include "test/codemaker/cppumaker/singletons/CLOCKS_PER_SEC.hpp"
+#include "test/codemaker/cppumaker/singletons/EDOM.hpp"
+#include "test/codemaker/cppumaker/singletons/EOF.hpp"
+#include "test/codemaker/cppumaker/singletons/ERANGE.hpp"
+#include "test/codemaker/cppumaker/singletons/EXIT_FAILURE.hpp"
+#include "test/codemaker/cppumaker/singletons/EXIT_SUCCESS.hpp"
+#include "test/codemaker/cppumaker/singletons/FILENAME_MAX.hpp"
+#include "test/codemaker/cppumaker/singletons/FOPEN_MAX.hpp"
+#include "test/codemaker/cppumaker/singletons/HUGE_VAL.hpp"
+#include "test/codemaker/cppumaker/singletons/LC_ALL.hpp"
+#include "test/codemaker/cppumaker/singletons/LC_COLLATE.hpp"
+#include "test/codemaker/cppumaker/singletons/LC_CTYPE.hpp"
+#include "test/codemaker/cppumaker/singletons/LC_MONETARY.hpp"
+#include "test/codemaker/cppumaker/singletons/LC_NUMERIC.hpp"
+#include "test/codemaker/cppumaker/singletons/LC_TIME.hpp"
+#include "test/codemaker/cppumaker/singletons/L_tmpnam.hpp"
+#include "test/codemaker/cppumaker/singletons/MB_CUR_MAX.hpp"
+#include "test/codemaker/cppumaker/singletons/NULL.hpp"
+#include "test/codemaker/cppumaker/singletons/RAND_MAX.hpp"
+#include "test/codemaker/cppumaker/singletons/SEEK_CUR.hpp"
+#include "test/codemaker/cppumaker/singletons/SEEK_END.hpp"
+#include "test/codemaker/cppumaker/singletons/SEEK_SET.hpp"
+#include "test/codemaker/cppumaker/singletons/SIGABRT.hpp"
+#include "test/codemaker/cppumaker/singletons/SIGFPE.hpp"
+#include "test/codemaker/cppumaker/singletons/SIGILL.hpp"
+#include "test/codemaker/cppumaker/singletons/SIGINT.hpp"
+#include "test/codemaker/cppumaker/singletons/SIGSEGV.hpp"
+#include "test/codemaker/cppumaker/singletons/SIGTERM.hpp"
+#include "test/codemaker/cppumaker/singletons/SIG_DFL.hpp"
+#include "test/codemaker/cppumaker/singletons/SIG_ERR.hpp"
+#include "test/codemaker/cppumaker/singletons/SIG_IGN.hpp"
+#include "test/codemaker/cppumaker/singletons/TMP_MAX.hpp"
+#include "test/codemaker/cppumaker/singletons/WCHAR_MAX.hpp"
+#include "test/codemaker/cppumaker/singletons/WCHAR_MIN.hpp"
+#include "test/codemaker/cppumaker/singletons/WEOF.hpp"
+#include "test/codemaker/cppumaker/singletons/assert.hpp"
+#include "test/codemaker/cppumaker/singletons/errno.hpp"
+#include "test/codemaker/cppumaker/singletons/offsetof.hpp"
+#include "test/codemaker/cppumaker/singletons/setjmp.hpp"
+#include "test/codemaker/cppumaker/singletons/stderr.hpp"
+#include "test/codemaker/cppumaker/singletons/stdin.hpp"
+#include "test/codemaker/cppumaker/singletons/stdout.hpp"
+#include "test/codemaker/cppumaker/singletons/CHAR_BIT.hpp"
+#include "test/codemaker/cppumaker/singletons/CHAR_MAX.hpp"
+#include "test/codemaker/cppumaker/singletons/CHAR_MIN.hpp"
+#include "test/codemaker/cppumaker/singletons/DBL_DIG.hpp"
+#include "test/codemaker/cppumaker/singletons/DBL_EPSILON.hpp"
+#include "test/codemaker/cppumaker/singletons/DBL_MANT_DIG.hpp"
+#include "test/codemaker/cppumaker/singletons/DBL_MAX.hpp"
+#include "test/codemaker/cppumaker/singletons/DBL_MAX_10_EXP.hpp"
+#include "test/codemaker/cppumaker/singletons/DBL_MAX_EXP.hpp"
+#include "test/codemaker/cppumaker/singletons/DBL_MIN.hpp"
+#include "test/codemaker/cppumaker/singletons/DBL_MIN_10_EXP.hpp"
+#include "test/codemaker/cppumaker/singletons/DBL_MIN_EXP.hpp"
+#include "test/codemaker/cppumaker/singletons/FLT_DIG.hpp"
+#include "test/codemaker/cppumaker/singletons/FLT_EPSILON.hpp"
+#include "test/codemaker/cppumaker/singletons/FLT_MANT_DIG.hpp"
+#include "test/codemaker/cppumaker/singletons/FLT_MAX.hpp"
+#include "test/codemaker/cppumaker/singletons/FLT_MAX_10_EXP.hpp"
+#include "test/codemaker/cppumaker/singletons/FLT_MAX_EXP.hpp"
+#include "test/codemaker/cppumaker/singletons/FLT_MIN.hpp"
+#include "test/codemaker/cppumaker/singletons/FLT_MIN_10_EXP.hpp"
+#include "test/codemaker/cppumaker/singletons/FLT_MIN_EXP.hpp"
+#include "test/codemaker/cppumaker/singletons/FLT_RADIX.hpp"
+#include "test/codemaker/cppumaker/singletons/FLT_ROUNDS.hpp"
+#include "test/codemaker/cppumaker/singletons/INT_MAX.hpp"
+#include "test/codemaker/cppumaker/singletons/INT_MIN.hpp"
+#include "test/codemaker/cppumaker/singletons/LDBL_DIG.hpp"
+#include "test/codemaker/cppumaker/singletons/LDBL_EPSILON.hpp"
+#include "test/codemaker/cppumaker/singletons/LDBL_MANT_DIG.hpp"
+#include "test/codemaker/cppumaker/singletons/LDBL_MAX.hpp"
+#include "test/codemaker/cppumaker/singletons/LDBL_MAX_10_EXP.hpp"
+#include "test/codemaker/cppumaker/singletons/LDBL_MAX_EXP.hpp"
+#include "test/codemaker/cppumaker/singletons/LDBL_MIN.hpp"
+#include "test/codemaker/cppumaker/singletons/LDBL_MIN_10_EXP.hpp"
+#include "test/codemaker/cppumaker/singletons/LDBL_MIN_EXP.hpp"
+#include "test/codemaker/cppumaker/singletons/LONG_MAX.hpp"
+#include "test/codemaker/cppumaker/singletons/LONG_MIN.hpp"
+#include "test/codemaker/cppumaker/singletons/MB_LEN_MAX.hpp"
+#include "test/codemaker/cppumaker/singletons/SCHAR_MAX.hpp"
+#include "test/codemaker/cppumaker/singletons/SCHAR_MIN.hpp"
+#include "test/codemaker/cppumaker/singletons/SHRT_MAX.hpp"
+#include "test/codemaker/cppumaker/singletons/SHRT_MIN.hpp"
+#include "test/codemaker/cppumaker/singletons/UCHAR_MAX.hpp"
+#include "test/codemaker/cppumaker/singletons/UINT_MAX.hpp"
+#include "test/codemaker/cppumaker/singletons/ULONG_MAX.hpp"
+#include "test/codemaker/cppumaker/singletons/USHRT_MAX.hpp"
+#include "test/codemaker/cppumaker/singletons/FILE.hpp"
+#include "test/codemaker/cppumaker/singletons/lconv.hpp"
+#include "test/codemaker/cppumaker/singletons/tm.hpp"
+#include "test/codemaker/cppumaker/singletons/std.hpp"
+#include "test/codemaker/cppumaker/singletons/NDEBUG.hpp"
+#include "test/codemaker/cppumaker/singletons/get.hpp"
+#include "test/codemaker/cppumaker/HelperEnum.hpp"
+#include "test/codemaker/cppumaker/HelperStruct.hpp"
+#include "test/codemaker/cppumaker/BigStruct.hpp"
+#include "test/codemaker/cppumaker/Struct.hpp"
+#include "test/codemaker/cppumaker/StructUsage.hpp"
+#include "test/codemaker/cppumaker/AlignmentDerivedStruct.hpp"
+#include "test/codemaker/cppumaker/TestException1.hpp"
+#include "test/codemaker/cppumaker/TestException2.hpp"
+#include "test/codemaker/cppumaker/Constants.hpp"
+
+#include "boost/scoped_array.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "com/sun/star/uno/TypeClass.hpp"
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#include <cstddef>
+#include <iostream>
+
+namespace {
+
+class Test: public CppUnit::TestFixture {
+public:
+    void testBigStruct();
+
+    void testPolyStruct();
+
+    void testExceptions();
+
+    void testConstants();
+
+    CPPUNIT_TEST_SUITE(Test);
+    CPPUNIT_TEST(testBigStruct);
+    CPPUNIT_TEST(testPolyStruct);
+    CPPUNIT_TEST(testExceptions);
+    CPPUNIT_TEST(testConstants);
+    CPPUNIT_TEST_SUITE_END();
+};
+
+struct Guard {
+    explicit Guard(void * buffer):
+        p(new(buffer) test::codemaker::cppumaker::BigStruct) {}
+
+    ~Guard() { p->test::codemaker::cppumaker::BigStruct::~BigStruct(); }
+
+    test::codemaker::cppumaker::BigStruct * const p;
+};
+
+void Test::testBigStruct() {
+    // Default-initialize a BigStruct instance on top of a memory buffer filled
+    // with random data, and make sure that all members are default-initialized:
+    boost::scoped_array< char > buffer(
+        new char[sizeof (test::codemaker::cppumaker::BigStruct)]);
+    for (std::size_t i = 0; i < sizeof (test::codemaker::cppumaker::BigStruct);
+         ++i)
+    {
+        buffer[i] = '\x56';
+    }
+    Guard guard(buffer.get());
+    CPPUNIT_ASSERT_EQUAL(guard.p->m1, sal_False);
+    CPPUNIT_ASSERT_EQUAL(guard.p->m2, static_cast< sal_Int8 >(0));
+    CPPUNIT_ASSERT_EQUAL(guard.p->m3, static_cast< sal_Int16 >(0));
+    CPPUNIT_ASSERT_EQUAL(guard.p->m4, static_cast< sal_uInt16 >(0));
+    CPPUNIT_ASSERT_EQUAL(guard.p->m5, static_cast< sal_Int32 >(0));
+    CPPUNIT_ASSERT_EQUAL(guard.p->m6, static_cast< sal_uInt32 >(0));
+    CPPUNIT_ASSERT_EQUAL(guard.p->m7, static_cast< sal_Int64 >(0));
+    CPPUNIT_ASSERT_EQUAL(guard.p->m8, static_cast< sal_uInt64 >(0));
+    CPPUNIT_ASSERT_EQUAL(guard.p->m9, 0.0f);
+    CPPUNIT_ASSERT_EQUAL(guard.p->m10, 0.0);
+    CPPUNIT_ASSERT_EQUAL(guard.p->m11, static_cast< sal_Unicode >(0));
+    CPPUNIT_ASSERT_EQUAL(guard.p->m12.getLength(), static_cast< sal_Int32 >(0));
+    CPPUNIT_ASSERT_EQUAL(
+        guard.p->m13.getTypeClass(), com::sun::star::uno::TypeClass_VOID);
+    CPPUNIT_ASSERT_EQUAL(guard.p->m14.hasValue(), sal_False);
+    CPPUNIT_ASSERT_EQUAL(guard.p->m15.getLength(), static_cast< sal_Int32 >(0));
+    CPPUNIT_ASSERT_EQUAL(
+        guard.p->m16, test::codemaker::cppumaker::HelperEnum_ZERO);
+    CPPUNIT_ASSERT_EQUAL(guard.p->m17.m1, sal_False);
+    CPPUNIT_ASSERT_EQUAL(guard.p->m17.m2.is(), sal_False);
+    CPPUNIT_ASSERT_EQUAL(guard.p->m18.is(), sal_False);
+    CPPUNIT_ASSERT_EQUAL(guard.p->m19, static_cast< sal_Int8 >(0));
+    CPPUNIT_ASSERT_EQUAL(
+        guard.p->m20, test::codemaker::cppumaker::HelperEnum_ZERO);
+    CPPUNIT_ASSERT_EQUAL(guard.p->m21.getLength(), static_cast< sal_Int32 >(0));
+    CPPUNIT_ASSERT_EQUAL(guard.p->m22.getLength(), static_cast< sal_Int32 >(0));
+    CPPUNIT_ASSERT_EQUAL(guard.p->m23.getLength(), static_cast< sal_Int32 >(0));
+
+#if defined __GNUC__ && __GNUC__ >= 3 // see CPPU_GCC3_ALIGN
+    CPPUNIT_ASSERT_EQUAL(
+#if defined X86_64
+        static_cast< std::size_t >(24),
+#else
+        static_cast< std::size_t >(16),
+#endif
+        sizeof (test::codemaker::cppumaker::AlignmentDerivedStruct));
+#endif
+
+    com::sun::star::uno::Type t(
+        cppu::UnoType< test::codemaker::cppumaker::BigStruct >::get());
+    typelib_TypeDescription * td = NULL;
+    t.getDescription(&td);
+    typelib_typedescription_complete(&td);
+    fprintf(stdout, "#### 1\n");
+    CPPUNIT_ASSERT(td != NULL);
+    CPPUNIT_ASSERT_EQUAL(typelib_TypeClass_STRUCT, td->eTypeClass);
+    typelib_StructTypeDescription * std =
+        reinterpret_cast< typelib_StructTypeDescription * >(td);
+    CPPUNIT_ASSERT_EQUAL(typelib_TypeClass_UNSIGNED_SHORT, std->aBase.ppTypeRefs[3]->eTypeClass); // unsigned short m4;
+    CPPUNIT_ASSERT_EQUAL(typelib_TypeClass_CHAR, std->aBase.ppTypeRefs[10]->eTypeClass); // char m11;
+}
+
+void Test::testPolyStruct() {
+    CPPUNIT_ASSERT_EQUAL(
+        rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "test.codemaker.cppumaker.Struct<char,short>")),
+        (com::sun::star::uno::makeAny(
+            test::codemaker::cppumaker::Struct< sal_Unicode, sal_Int16 >()).
+         getValueType().getTypeName()));
+    CPPUNIT_ASSERT_EQUAL(
+        (test::codemaker::cppumaker::make_Struct< sal_uInt32, sal_Bool >(5, 0).
+         member1),
+        static_cast< sal_uInt32 >(5));
+}
+
+namespace {
+
+bool operator ==(
+    test::codemaker::cppumaker::TestException1 const & e1,
+    test::codemaker::cppumaker::TestException1 const & e2)
+{
+    return e1.Message == e2.Message && e1.Context == e2.Context
+        && e1.m1 == e2.m1 && e1.m2 == e2.m2 && e1.m3 == e2.m3
+        && e1.m4.member1 == e2.m4.member1 && e1.m4.member2 == e2.m4.member2;
+}
+
+std::ostream & operator <<(
+    std::ostream & out, com::sun::star::uno::Exception const &)
+{
+    return out << "<UNO exception>";
+}
+
+}
+
+void Test::testExceptions() {
+    test::codemaker::cppumaker::TestException1 e11(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")), 0, 1,
+        com::sun::star::uno::makeAny(123.0),
+        test::codemaker::cppumaker::HelperEnum_ONE,
+        test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, 0), 2);
+    test::codemaker::cppumaker::TestException1 e12(e11);
+    CPPUNIT_ASSERT_EQUAL(e11, e12);
+    test::codemaker::cppumaker::TestException1 e13;
+    e13 = e11;
+    CPPUNIT_ASSERT_EQUAL(e11, e13);
+    test::codemaker::cppumaker::TestException2 e21(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")), 0, 1,
+        com::sun::star::uno::makeAny(123.0),
+        test::codemaker::cppumaker::HelperEnum_ONE,
+        test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, 0), 2);
+    test::codemaker::cppumaker::TestException2 e22(e21);
+    CPPUNIT_ASSERT_EQUAL(e21, e22);
+    test::codemaker::cppumaker::TestException2 e23;
+    e23 = e21;
+    CPPUNIT_ASSERT_EQUAL(e21, e23);
+}
+
+void Test::testConstants() {
+    CPPUNIT_ASSERT_EQUAL(
+        SAL_MIN_INT8, test::codemaker::cppumaker::Constants::byteMin);
+    CPPUNIT_ASSERT_EQUAL(
+        SAL_MAX_INT8, test::codemaker::cppumaker::Constants::byteMax);
+    CPPUNIT_ASSERT_EQUAL(
+        static_cast< sal_Int8 >(-1),
+        test::codemaker::cppumaker::Constants::byteNeg);
+    CPPUNIT_ASSERT_EQUAL(
+        SAL_MIN_INT16, test::codemaker::cppumaker::Constants::shortMin);
+    CPPUNIT_ASSERT_EQUAL(
+        SAL_MAX_INT16, test::codemaker::cppumaker::Constants::shortMax);
+    CPPUNIT_ASSERT_EQUAL(
+        static_cast< sal_uInt16 >(0),
+        test::codemaker::cppumaker::Constants::unsignedShortMin);
+    CPPUNIT_ASSERT_EQUAL(
+        SAL_MAX_UINT16,
+        test::codemaker::cppumaker::Constants::unsignedShortMax);
+    CPPUNIT_ASSERT_EQUAL(
+        SAL_MIN_INT32, test::codemaker::cppumaker::Constants::longMin);
+    CPPUNIT_ASSERT_EQUAL(
+        SAL_MAX_INT32, test::codemaker::cppumaker::Constants::longMax);
+    CPPUNIT_ASSERT_EQUAL(
+        static_cast< sal_uInt32 >(0),
+        test::codemaker::cppumaker::Constants::unsignedLongMin);
+    CPPUNIT_ASSERT_EQUAL(
+        SAL_MAX_UINT32, test::codemaker::cppumaker::Constants::unsignedLongMax);
+    CPPUNIT_ASSERT_EQUAL(
+        SAL_MIN_INT64, test::codemaker::cppumaker::Constants::hyperMin);
+    CPPUNIT_ASSERT_EQUAL(
+        SAL_MAX_INT64, test::codemaker::cppumaker::Constants::hyperMax);
+    CPPUNIT_ASSERT_EQUAL(
+        static_cast< sal_uInt64 >(0),
+        test::codemaker::cppumaker::Constants::unsignedHyperMin);
+    CPPUNIT_ASSERT_EQUAL(
+        SAL_MAX_UINT64,
+        test::codemaker::cppumaker::Constants::unsignedHyperMax);
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
+
+}
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/qa/cppumaker/types.idl b/cppu/qa/cppumaker/types.idl
new file mode 100644
index 0000000..20e2dad
--- /dev/null
+++ b/cppu/qa/cppumaker/types.idl
@@ -0,0 +1,717 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list