diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 13:02:24 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 13:02:24 +0000 |
| commit | f03313ed382088d032c3b44f32e65496502401b5 (patch) | |
| tree | 2067f56306fde61b750da8e99eea6fbbfaaa3f14 /comphelper/source/property/property.cxx | |
| parent | 4d9c7e9a111ad4f074b356bdd6d51b9c9705e5a3 (diff) | |
INTEGRATION: CWS dba23c (1.9.42); FILE MERGED
2007/07/17 19:56:38 fs 1.9.42.1: #149583# copyProperties: don't crash on NULL arguments
Diffstat (limited to 'comphelper/source/property/property.cxx')
| -rw-r--r-- | comphelper/source/property/property.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/comphelper/source/property/property.cxx b/comphelper/source/property/property.cxx index 5a83688ac2de..a0f009b992ab 100644 --- a/comphelper/source/property/property.cxx +++ b/comphelper/source/property/property.cxx @@ -4,9 +4,9 @@ * * $RCSfile: property.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: vg $ $Date: 2007-01-15 14:44:49 $ + * last change: $Author: hr $ $Date: 2007-07-31 14:02:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -100,6 +100,7 @@ void copyProperties(const Reference<XPropertySet>& _rxSource, if (!_rxSource.is() || !_rxDest.is()) { OSL_ENSURE(sal_False, "copyProperties: invalid arguments !"); + return; } Reference< XPropertySetInfo > xSourceProps = _rxSource->getPropertySetInfo(); |