diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-28 16:03:53 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-28 16:03:53 +0000 |
| commit | 7937347c588e3445dc600339fb0bb0d4c09cbf0b (patch) | |
| tree | 6ae5bf242522f17b5c60ed6130406fa1fb0ad804 /comphelper/source/property/propagg.cxx | |
| parent | f96807bafd4998e321cc83fba4eb034d0a6a8606 (diff) | |
INTEGRATION: CWS dba12 (1.10.118); FILE MERGED
2004/04/28 06:50:53 fs 1.10.118.1: #i25306# setPropertyToDefault: not all exceptions are allowed to leave
Diffstat (limited to 'comphelper/source/property/propagg.cxx')
| -rw-r--r-- | comphelper/source/property/propagg.cxx | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx index 9add1a2593e3..eaff3eae757b 100644 --- a/comphelper/source/property/propagg.cxx +++ b/comphelper/source/property/propagg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: propagg.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: vg $ $Date: 2003-04-15 16:45:42 $ + * last change: $Author: hjs $ $Date: 2004-06-28 17:03:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -816,7 +816,18 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const ::rtl::O m_xAggregateState->setPropertyToDefault(_rPropertyName); } else - setPropertyToDefaultByHandle(nHandle); + { + try + { + setPropertyToDefaultByHandle( nHandle ); + } + catch( const UnknownPropertyException& ) { throw; } + catch( const RuntimeException& ) { throw; } + catch( const Exception& ) + { + OSL_ENSURE( sal_False, "OPropertySetAggregationHelper::setPropertyToDefault: caught an exception which is not allowed to leave here!" ); + } + } } //------------------------------------------------------------------------------ |