diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-12-01 16:20:44 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-12-01 16:20:44 +0000 |
| commit | bfb48c0eb0521537585b0733e00474882280e26c (patch) | |
| tree | e5e02aa1db03b87e5066fd3e2e95fda642684965 /cppuhelper/test/testimplhelper.cxx | |
| parent | 0e8ac1f273cc8a6d688a4dc6fc2fdb0e4516e2ab (diff) | |
INTEGRATION: CWS bunoidmap (1.9.20); FILE MERGED
2006/11/09 14:31:20 kr 1.9.20.1: fixed: i71156 - cppuhelper/test does not build and work
Diffstat (limited to 'cppuhelper/test/testimplhelper.cxx')
| -rw-r--r-- | cppuhelper/test/testimplhelper.cxx | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/cppuhelper/test/testimplhelper.cxx b/cppuhelper/test/testimplhelper.cxx index 71252126186d..9587f5c81c56 100644 --- a/cppuhelper/test/testimplhelper.cxx +++ b/cppuhelper/test/testimplhelper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: testimplhelper.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2006-09-16 12:45:01 $ + * last change: $Author: rt $ $Date: 2006-12-01 17:20:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,6 +33,11 @@ * ************************************************************************/ +#if !defined(OSL_DEBUG_LEVEL) || OSL_DEBUG_LEVEL == 0 +# undef OSL_DEBUG_LEVEL +# define OSL_DEBUG_LEVEL 2 +#endif + // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cppuhelper.hxx" @@ -432,7 +437,7 @@ void throw_one( //================================================================================================== -void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & xSF ) +void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ ) { Reference< XInterface > xImpl( (lang::XTypeProvider *)new TestImpl() ); Reference< lang::XTypeProvider > xTP1( xImpl, UNO_QUERY ); @@ -559,18 +564,18 @@ void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & xSF ) { OSL_ENSURE( sal_False, "### unexpected IllegalAccessException exception caught!" ); } - catch (Exception rExc) + catch (Exception & rExc2) { - OSL_ENSURE( rExc.Message.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("exc") ) && rExc.Context == xImpl, + OSL_ENSURE( rExc2.Message.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("exc") ) && rExc2.Context == xImpl, "### unexpected exception content!" ); try { throwException( makeAny( lang::IllegalAccessException( - OUString( RTL_CONSTASCII_USTRINGPARAM("axxess exc") ), rExc.Context ) ) ); + OUString( RTL_CONSTASCII_USTRINGPARAM("axxess exc") ), rExc2.Context ) ) ); } - catch (lang::IllegalAccessException & rExc) + catch (lang::IllegalAccessException & rExc3) { - OSL_ENSURE( rExc.Message.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("axxess exc") ) && rExc.Context == xImpl, + OSL_ENSURE( rExc3.Message.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("axxess exc") ) && rExc3.Context == xImpl, "### unexpected exception content!" ); return; } |