diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:21:38 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:21:38 +0000 |
| commit | 4970362120e2b12b93718349b74af5e0cd103e15 (patch) | |
| tree | 1d0334c1e26f04133926e7fe5208c456676c296a /forms/source/component/ComboBox.cxx | |
| parent | 46457738d870c76335023d4cdc141eb8f5766ccf (diff) | |
INTEGRATION: CWS hb02 (1.34.30); FILE MERGED
2007/02/06 10:29:54 hbrinkm 1.34.30.3: RESYNC: (1.34-1.35); FILE MERGED
2007/02/01 12:09:35 fs 1.34.30.2: #i74051# split describeFixedProperties in describeFixedProperties and describeAggregateProperties
2007/01/31 10:55:24 fs 1.34.30.1: changed handling of properties in the course of #i74051#
Diffstat (limited to 'forms/source/component/ComboBox.cxx')
| -rw-r--r-- | forms/source/component/ComboBox.cxx | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index 49e94faff448..56c4e9e1fbd7 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ComboBox.cxx,v $ * - * $Revision: 1.35 $ + * $Revision: 1.36 $ * - * last change: $Author: vg $ $Date: 2007-01-15 13:46:07 $ + * last change: $Author: obo $ $Date: 2007-03-09 13:21:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -359,27 +359,9 @@ sal_Bool OComboBoxModel::convertFastPropertyValue( } //------------------------------------------------------------------------------ -Reference<XPropertySetInfo> SAL_CALL OComboBoxModel::getPropertySetInfo() throw(RuntimeException) -{ - Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); - return xInfo; -} - -//------------------------------------------------------------------------------ -cppu::IPropertyArrayHelper& OComboBoxModel::getInfoHelper() -{ - return *const_cast<OComboBoxModel*>(this)->getArrayHelper(); -} - -//------------------------------------------------------------------------------ -void OComboBoxModel::fillProperties( - Sequence< Property >& _rProps, - Sequence< Property >& _rAggregateProps ) const +void OComboBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 6, OBoundControlModel ) - RemoveProperty( _rAggregateProps, PROPERTY_STRINGITEMLIST ); - // we want to "override" this property - DECL_PROP1(TABINDEX, sal_Int16, BOUND); DECL_PROP1(LISTSOURCETYPE, ListSourceType, BOUND); DECL_PROP1(LISTSOURCE, ::rtl::OUString, BOUND); @@ -390,6 +372,15 @@ void OComboBoxModel::fillProperties( } //------------------------------------------------------------------------------ +void OComboBoxModel::describeAggregateProperties( Sequence< Property >& _rAggregateProps ) const +{ + OBoundControlModel::describeAggregateProperties( _rAggregateProps ); + + // superseded properties: + RemoveProperty( _rAggregateProps, PROPERTY_STRINGITEMLIST ); +} + +//------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL OComboBoxModel::getServiceName() throw(RuntimeException) { return FRM_COMPONENT_COMBOBOX; // old (non-sun) name for compatibility ! |