diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-05 15:35:10 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-05 15:35:10 +0000 |
| commit | 70efd890838157632bc40fe3eb3f1c61c12b3535 (patch) | |
| tree | 62fb206df69dcf151ef94f36a8fe5f98fb460782 /testtools | |
| parent | 3ea2f4d21214dd2393a9685974323aac93fb4003 (diff) | |
INTEGRATION: CWS jl97 (1.23.6); FILE MERGED
2008/04/23 08:44:41 jl 1.23.6.1: #i88594# cpp test can be build with the compcheck switch to allow testing with testcomponents build with a previous compiler
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/source/bridgetest/bridgetest.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index 56c679cb0234..124b97e1c868 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: bridgetest.cxx,v $ - * $Revision: 1.23 $ + * $Revision: 1.24 $ * * This file is part of OpenOffice.org. * @@ -980,7 +980,14 @@ static sal_Bool raiseException( const Reference< XBridgeTest > & xLBT ) #endif aExc.Context == xLBT->getInterface()) { +#ifdef COMPCHECK + //When we check if a new compiler still works then we must not call + //getRuntimeException because it uses cppu::getCaughtException which + //does only work if all libs are build with the same runtime. + return true; +#else ++nCount; +#endif } else { |