#92401# reformed queryAggregation - lates SUN PRO compiler produces _wrong_ code with the old form
This commit is contained in:
parent
ee17b7754b
commit
f22e1e4f12
1 changed files with 7 additions and 7 deletions
|
@ -2,9 +2,9 @@
|
|||
*
|
||||
* $RCSfile: ListBox.cxx,v $
|
||||
*
|
||||
* $Revision: 1.20 $
|
||||
* $Revision: 1.21 $
|
||||
*
|
||||
* last change: $Author: fs $ $Date: 2001-08-30 14:08:34 $
|
||||
* last change: $Author: fs $ $Date: 2001-09-28 18:15:33 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
|
@ -238,11 +238,11 @@ StringSequence SAL_CALL OListBoxModel::getSupportedServiceNames() throw(RuntimeE
|
|||
Any SAL_CALL OListBoxModel::queryAggregation(const Type& _rType) throw (RuntimeException)
|
||||
{
|
||||
Any aReturn = OBoundControlModel::queryAggregation( _rType );
|
||||
return aReturn.hasValue()
|
||||
? aReturn
|
||||
: aReturn = ( OListBoxModel_BASE::queryInterface( _rType ) ).hasValue()
|
||||
? aReturn
|
||||
: OErrorBroadcaster::queryInterface( _rType );
|
||||
if ( !aReturn.hasValue() )
|
||||
aReturn = OListBoxModel_BASE::queryInterface( _rType );
|
||||
if ( !aReturn.hasValue() )
|
||||
aReturn = OErrorBroadcaster::queryInterface( _rType );
|
||||
return aReturn;
|
||||
}
|
||||
|
||||
// OComponentHelper
|
||||
|
|
Loading…
Reference in a new issue