diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-27 11:59:15 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-27 11:59:15 +0000 |
| commit | f9e7dc934bfb9d15e1d3d4966fe58f19844e00e8 (patch) | |
| tree | 17dad115eb39de62377aabdea85e75530a5fa8e0 /connectivity | |
| parent | f9ae22ad9027ed6732017d92ac1ef38f84eef330 (diff) | |
INTEGRATION: CWS solsfix (1.10.10); FILE MERGED
2004/11/25 06:44:31 oj 1.10.10.1: #i37818# fix ?: operator
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/commontools/dbtools2.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index b99b8f9b53..295ae032c5 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dbtools2.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: obo $ $Date: 2004-11-17 14:05:10 $ + * last change: $Author: hr $ $Date: 2004-11-27 12:59:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -545,7 +545,7 @@ namespace 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; |