diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-01-19 14:30:02 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-01-19 14:30:02 +0000 |
| commit | 5e731fbc1429d7c2eae1986239b716d70da27fd2 (patch) | |
| tree | 2f927f054fde93339ec555471419a96a82104b48 /connectivity/source/commontools | |
| parent | 3716e85f8e1267b967bfc929461b40feffc41c82 (diff) | |
INTEGRATION: CWS dba202e (1.57.38); FILE MERGED
2005/12/08 13:37:24 fs 1.57.38.1: #114920# recognize empty source/dest set
Diffstat (limited to 'connectivity/source/commontools')
| -rw-r--r-- | connectivity/source/commontools/dbtools.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index b2f49469b932..b83d856d8720 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -4,9 +4,9 @@ * * $RCSfile: dbtools.cxx,v $ * - * $Revision: 1.57 $ + * $Revision: 1.58 $ * - * last change: $Author: hr $ $Date: 2005-09-23 11:36:41 $ + * last change: $Author: obo $ $Date: 2006-01-19 15:30:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -939,6 +939,10 @@ void TransferFormComponentProperties( { try { + OSL_ENSURE( xOldProps.is() && xNewProps.is(), "TransferFormComponentProperties: invalid source/dest!" ); + if ( !xOldProps.is() || !xNewProps.is() ) + return; + // kopieren wir erst mal alle Props, die in Quelle und Ziel vorhanden sind und identische Beschreibungen haben Reference< XPropertySetInfo> xOldInfo( xOldProps->getPropertySetInfo()); Reference< XPropertySetInfo> xNewInfo( xNewProps->getPropertySetInfo()); |