diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-24 11:40:23 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-24 11:40:23 +0200 |
| commit | f8115ce72dad45b82b044d9c8f5c253d0514574d (patch) | |
| tree | 9bdeb7018284556ec26ce2c81f4c91addd0374de /svx | |
| parent | e2080e70fe8b085f18e868e46340454720fa94ca (diff) | |
fdo#75339: Substituting XInterface* eq. for object eq. requires queryInterface
Regression introduced with 6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 "Use the new
type-checking Reference constructor to reduce code noise" which should have left
(at least some) "querying upcasts" to XInterface alone. Closer inspection of
that commit will probably turn up further regressions that need to be reverted.
Change-Id: Ib81afc12d9df205b5b0fe6cec6ce85d012e9629f
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/formcontroller.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 171da47a3a72..6660be4dfa0e 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -354,6 +354,8 @@ void ColumnInfoCache::initializeControls( const Sequence< Reference< XControl > lcl_resetColumnControlInfo( *col ); + Reference< XInterface > xNormColumn( col->xColumn, UNO_QUERY_THROW ); + const Reference< XControl >* pControl( _rControls.getConstArray() ); const Reference< XControl >* pControlEnd( pControl + _rControls.getLength() ); for ( ; pControl != pControlEnd; ++pControl ) @@ -375,7 +377,7 @@ void ColumnInfoCache::initializeControls( const Sequence< Reference< XControl > { Reference< XPropertySet > xGridColumnModel( xGridColAccess->getByIndex( gridCol ), UNO_QUERY_THROW ); - if ( !lcl_isBoundTo( xGridColumnModel, col->xColumn ) + if ( !lcl_isBoundTo( xGridColumnModel, xNormColumn ) || !lcl_isInputRequired( xGridColumnModel ) ) continue; // with next grid column @@ -395,7 +397,7 @@ void ColumnInfoCache::initializeControls( const Sequence< Reference< XControl > } if ( !xModelPSI->hasPropertyByName( FM_PROP_BOUNDFIELD ) - || !lcl_isBoundTo( xModel, col->xColumn ) + || !lcl_isBoundTo( xModel, xNormColumn ) || !lcl_isInputRequired( xModel ) ) continue; // with next control |