diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:29:22 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:29:22 +0000 |
| commit | 2039eeef18c80a8c3bee40848c97409ec5239e88 (patch) | |
| tree | b9fc70b868ae854a76461c4087b04bc49cf7ef5f /forms | |
| parent | 2525f75198ec65dccd973bb33d1955d9932021ed (diff) | |
INTEGRATION: CWS hb02 (1.49.30); FILE MERGED
2007/02/06 10:30:25 hbrinkm 1.49.30.3: RESYNC: (1.49-1.50); FILE MERGED
2007/02/01 12:09:40 fs 1.49.30.2: #i74051# split describeFixedProperties in describeFixedProperties and describeAggregateProperties
2007/01/31 10:55:28 fs 1.49.30.1: changed handling of properties in the course of #i74051#
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/ListBox.cxx | 33 |
1 files changed, 12 insertions, 21 deletions
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<XPropertySetInfo> SAL_CALL OListBoxModel::getPropertySetInfo() throw(RuntimeException) - { - Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); - return xInfo; - } - - //------------------------------------------------------------------------------ - cppu::IPropertyArrayHelper& OListBoxModel::getInfoHelper() - { - return *const_cast<OListBoxModel*>(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); @@ -500,6 +482,15 @@ namespace frm } //------------------------------------------------------------------------------ + void OListBoxModel::describeAggregateProperties( Sequence< Property >& _rAggregateProps ) const + { + OBoundControlModel::describeAggregateProperties( _rAggregateProps ); + + // superseded properties: + RemoveProperty( _rAggregateProps, PROPERTY_STRINGITEMLIST ); + } + + //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL OListBoxModel::getServiceName() throw(RuntimeException) { return FRM_COMPONENT_LISTBOX; // old (non-sun) name for compatibility ! |