diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 12:21:55 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 12:21:55 +0000 |
| commit | 3ebbdfec201017edc00e98c07da516761bf1c2dc (patch) | |
| tree | 39f919245c134a2ed3580f96281ec5a22b883e85 /cppuhelper | |
| parent | e8dc3cc0786a0c0244948095559240774f5a1bfe (diff) | |
INTEGRATION: CWS sb70 (1.5.24); FILE MERGED
2007/06/05 08:17:25 sb 1.5.24.1: #i68624# Do not crash on adding NULL listeners.
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/propertysetmixin.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cppuhelper/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx index 38eba317d407..c2191aacab99 100644 --- a/cppuhelper/source/propertysetmixin.cxx +++ b/cppuhelper/source/propertysetmixin.cxx @@ -4,9 +4,9 @@ * * $RCSfile: propertysetmixin.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: hr $ $Date: 2007-01-03 11:37:19 $ + * last change: $Author: hr $ $Date: 2007-06-27 13:21:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1223,7 +1223,8 @@ void PropertySetMixinImpl::addPropertyChangeListener( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { - OSL_ASSERT(listener.is()); + css::uno::Reference< css::beans::XPropertyChangeListener >( + listener, css::uno::UNO_QUERY_THROW); // reject NULL listener checkUnknown(propertyName); try { bool disposed; @@ -1279,7 +1280,8 @@ void PropertySetMixinImpl::addVetoableChangeListener( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { - OSL_ASSERT(listener.is()); + css::uno::Reference< css::beans::XVetoableChangeListener >( + listener, css::uno::UNO_QUERY_THROW); // reject NULL listener checkUnknown(propertyName); try { bool disposed; |