diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index dd30419db45f..6d328b8561f7 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ListBox.cxx,v $ * - * $Revision: 1.50 $ + * $Revision: 1.51 $ * - * last change: $Author: vg $ $Date: 2007-01-15 13:47:04 $ + * last change: $Author: obo $ $Date: 2007-03-09 13:29:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -468,27 +468,9 @@ namespace frm } //------------------------------------------------------------------------------ - Reference SAL_CALL OListBoxModel::getPropertySetInfo() throw(RuntimeException) - { - Reference xInfo( createPropertySetInfo( getInfoHelper() ) ); - return xInfo; - } - - //------------------------------------------------------------------------------ - cppu::IPropertyArrayHelper& OListBoxModel::getInfoHelper() - { - return *const_cast(this)->getArrayHelper(); - } - - //------------------------------------------------------------------------------ - void OListBoxModel::fillProperties( - Sequence< Property >& _rProps, - Sequence< Property >& _rAggregateProps ) const + void OListBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 7, OBoundControlModel ) - RemoveProperty( _rAggregateProps, PROPERTY_STRINGITEMLIST ); - // we want to "override" this property - DECL_PROP1(TABINDEX, sal_Int16, BOUND); DECL_PROP2(BOUNDCOLUMN, sal_Int16, BOUND, MAYBEVOID); DECL_PROP1(LISTSOURCETYPE, ListSourceType, BOUND); @@ -499,6 +481,15 @@ namespace frm END_DESCRIBE_PROPERTIES(); } + //------------------------------------------------------------------------------ + void OListBoxModel::describeAggregateProperties( Sequence< Property >& _rAggregateProps ) const + { + OBoundControlModel::describeAggregateProperties( _rAggregateProps ); + + // superseded properties: + RemoveProperty( _rAggregateProps, PROPERTY_STRINGITEMLIST ); + } + //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL OListBoxModel::getServiceName() throw(RuntimeException) {