summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Schönheit <fs@openoffice.org>2001-09-28 17:15:33 +0000
committerFrank Schönheit <fs@openoffice.org>2001-09-28 17:15:33 +0000
commitf22e1e4f12a0be9dd40ef2207e84c9d74f9b780a (patch)
treec4435fadf6f9bdf5a72eccfc22a9a34a4e30e135
parentee17b7754b35e67f6a086165112287b2e08bcd39 (diff)
#92401# reformed queryAggregation - lates SUN PRO compiler produces _wrong_ code with the old form
-rw-r--r--forms/source/component/ListBox.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 9128b1e33238..838be478c3ed 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -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