Kaydet (Commit) f8115ce7 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

fdo#75339: Substituting XInterface* eq. for object eq. requires queryInterface

Regression introduced with 6a043e9c "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
üst e2080e70
...@@ -354,6 +354,8 @@ void ColumnInfoCache::initializeControls( const Sequence< Reference< XControl > ...@@ -354,6 +354,8 @@ void ColumnInfoCache::initializeControls( const Sequence< Reference< XControl >
lcl_resetColumnControlInfo( *col ); lcl_resetColumnControlInfo( *col );
Reference< XInterface > xNormColumn( col->xColumn, UNO_QUERY_THROW );
const Reference< XControl >* pControl( _rControls.getConstArray() ); const Reference< XControl >* pControl( _rControls.getConstArray() );
const Reference< XControl >* pControlEnd( pControl + _rControls.getLength() ); const Reference< XControl >* pControlEnd( pControl + _rControls.getLength() );
for ( ; pControl != pControlEnd; ++pControl ) for ( ; pControl != pControlEnd; ++pControl )
...@@ -375,7 +377,7 @@ void ColumnInfoCache::initializeControls( const Sequence< Reference< XControl > ...@@ -375,7 +377,7 @@ void ColumnInfoCache::initializeControls( const Sequence< Reference< XControl >
{ {
Reference< XPropertySet > xGridColumnModel( xGridColAccess->getByIndex( gridCol ), UNO_QUERY_THROW ); Reference< XPropertySet > xGridColumnModel( xGridColAccess->getByIndex( gridCol ), UNO_QUERY_THROW );
if ( !lcl_isBoundTo( xGridColumnModel, col->xColumn ) if ( !lcl_isBoundTo( xGridColumnModel, xNormColumn )
|| !lcl_isInputRequired( xGridColumnModel ) || !lcl_isInputRequired( xGridColumnModel )
) )
continue; // with next grid column continue; // with next grid column
...@@ -395,7 +397,7 @@ void ColumnInfoCache::initializeControls( const Sequence< Reference< XControl > ...@@ -395,7 +397,7 @@ void ColumnInfoCache::initializeControls( const Sequence< Reference< XControl >
} }
if ( !xModelPSI->hasPropertyByName( FM_PROP_BOUNDFIELD ) if ( !xModelPSI->hasPropertyByName( FM_PROP_BOUNDFIELD )
|| !lcl_isBoundTo( xModel, col->xColumn ) || !lcl_isBoundTo( xModel, xNormColumn )
|| !lcl_isInputRequired( xModel ) || !lcl_isInputRequired( xModel )
) )
continue; // with next control continue; // with next control
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment