diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-27 12:00:31 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-27 12:00:31 +0000 |
| commit | bd960659f51cf7771fb222db9af51ef9a3f48405 (patch) | |
| tree | 66130878da58002261cf069eec196f8dc1259c28 /forms/source | |
| parent | d3d3e7f4228da1e58075a5a6bbc48a37f770ffe8 (diff) | |
INTEGRATION: CWS solsfix (1.62.10); FILE MERGED
2004/11/25 06:56:13 oj 1.62.10.1: #i37818# fix ?: operator
Diffstat (limited to 'forms/source')
| -rw-r--r-- | forms/source/component/DatabaseForm.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index bf87ecf1e926..fb5ef57e751b 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DatabaseForm.cxx,v $ * - * $Revision: 1.64 $ + * $Revision: 1.65 $ * - * last change: $Author: obo $ $Date: 2004-11-17 14:36:09 $ + * last change: $Author: hr $ $Date: 2004-11-27 13:00:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -298,7 +298,7 @@ Reference< XModel> getXModel(const Reference< XInterface>& xIface) while( xParent.is() && !xModel.is() ) { Reference<XChild> xChild(xParent,UNO_QUERY); - xParent.set(xChild.is() ? xChild->getParent() : NULL,UNO_QUERY); + xParent.set(xChild.is() ? xChild->getParent() : Reference< XInterface >(),UNO_QUERY); xModel.set(xParent,UNO_QUERY); } return xModel; |