diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-25 10:51:03 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-25 10:51:03 +0000 |
| commit | 274c3fa5470259caaac6c1ae3e795aa82774771e (patch) | |
| tree | e5865d7567bf7447158b771ced1b2510d06f4c93 /testtools | |
| parent | 681a3f384ec7160498f7c31bbe878da1c0c0efb9 (diff) | |
INTEGRATION: CWS jl104 (1.9.6); FILE MERGED
2008/06/19 10:04:10 jl 1.9.6.1: #i88078# moving tests from cli_ure to testtools
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx index 7ae5d2b7018c..c84a11ab7f77 100644 --- a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx +++ b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx @@ -1,5 +1,6 @@ /************************************************************************* * +<<<<<<< cli_cpp_bridgetest.cxx * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * Copyright 2008 by Sun Microsystems, Inc. @@ -7,7 +8,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: cli_cpp_bridgetest.cxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.10 $ * * This file is part of OpenOffice.org. * @@ -25,6 +26,33 @@ * version 3 along with OpenOffice.org. If not, see * <http://www.openoffice.org/license.html> * for a copy of the LGPLv3 License. +======= + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: cli_cpp_bridgetest.cxx,v $ + * $Revision: 1.10 $ + * + * 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. +>>>>>>> 1.8.58.2 * ************************************************************************/ @@ -34,7 +62,7 @@ #using <mscorlib.dll> #using <System.dll> #using <cli_basetypes.dll> -#using <cli_types.dll> +#using <cli_uretypes.dll> #using <cli_ure.dll> #using <cli_types_bridgetest.dll> |