diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-27 12:02:20 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-27 12:02:20 +0000 |
| commit | b5075de25cdc87d4d72c613b2d80f8568b724762 (patch) | |
| tree | fbd983c092515bc83e112544ab32eb167fb8852d /extensions | |
| parent | bd960659f51cf7771fb222db9af51ef9a3f48405 (diff) | |
INTEGRATION: CWS solsfix (1.6.2); FILE MERGED
2004/11/25 06:55:04 oj 1.6.2.1: #i37818# fix ?: operator
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/cellbindinghelper.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/extensions/source/propctrlr/cellbindinghelper.cxx b/extensions/source/propctrlr/cellbindinghelper.cxx index 101028d90102..c8b296ebf8fa 100644 --- a/extensions/source/propctrlr/cellbindinghelper.cxx +++ b/extensions/source/propctrlr/cellbindinghelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cellbindinghelper.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2004-11-16 12:03:09 $ + * last change: $Author: hr $ $Date: 2004-11-27 13:02:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -207,10 +207,10 @@ namespace pcr while ( ( xParentAsForm.is() || xParentAsGrid.is() ) && xCheck.is() ) { xCheck = xCheck.query( xCheck->getParent() ); - xParentAsForm = xParentAsForm.query( xCheck.is() ? xCheck->getParent() : NULL ); - xParentAsGrid = xParentAsGrid.query( xCheck.is() ? xCheck->getParent() : NULL ); + xParentAsForm = xParentAsForm.query( xCheck.is() ? xCheck->getParent() : Reference< XForm >() ); + xParentAsGrid = xParentAsGrid.query( xCheck.is() ? xCheck->getParent() : Reference< XGridColumnFactory >() ); } - Reference< XInterface > xFormsCollection( xCheck.is() ? xCheck->getParent() : NULL ); + Reference< XInterface > xFormsCollection( xCheck.is() ? xCheck->getParent() : Reference< XInterface >() ); // now iterate through the sheets Reference< XIndexAccess > xSheets( m_xDocument->getSheets(), UNO_QUERY ); |