diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:23:37 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:23:37 +0000 |
| commit | 2bd3704078351790d6fa134346576ee0ed29f444 (patch) | |
| tree | a74e5c132de0a23793be544c32ae3c298a335a5e /forms/source/component/Edit.cxx | |
| parent | ebc12ddfc981ad53604249e533bb0847ba6dacd2 (diff) | |
INTEGRATION: CWS hb02 (1.36.8); FILE MERGED
2007/02/06 10:29:48 hbrinkm 1.36.8.3: RESYNC: (1.36-1.37); FILE MERGED
2007/02/01 12:09:36 fs 1.36.8.2: #i74051# split describeFixedProperties in describeFixedProperties and describeAggregateProperties
2007/01/31 10:55:25 fs 1.36.8.1: changed handling of properties in the course of #i74051#
Diffstat (limited to 'forms/source/component/Edit.cxx')
| -rw-r--r-- | forms/source/component/Edit.cxx | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index e45482bfe6bc..b4abc06508ee 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -4,9 +4,9 @@ * * $RCSfile: Edit.cxx,v $ * - * $Revision: 1.37 $ + * $Revision: 1.38 $ * - * last change: $Author: vg $ $Date: 2007-01-15 13:46:42 $ + * last change: $Author: obo $ $Date: 2007-03-09 13:23:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -432,13 +432,6 @@ StringSequence SAL_CALL OEditModel::getSupportedServiceNames() throw() } // XPropertySet -//------------------------------------------------------------------------------ -Reference<XPropertySetInfo> SAL_CALL OEditModel::getPropertySetInfo() throw(RuntimeException) -{ - Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); - return xInfo; -} -// ----------------------------------------------------------------------------- void SAL_CALL OEditModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle ) const { if ( PROPERTY_ID_PERSISTENCE_MAXTEXTLENGTH == nHandle ) @@ -455,19 +448,9 @@ void SAL_CALL OEditModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle ) } //------------------------------------------------------------------------------ -void OEditModel::fillProperties( - Sequence< Property >& _rProps, - Sequence< Property >& _rAggregateProps ) const +void OEditModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 5, OEditBaseModel ) - // our aggregate is a rich text model, which also derives from OControlModel, as - // do we, so we need to remove some duplicate properties - RemoveProperty( _rAggregateProps, PROPERTY_TABINDEX ); - RemoveProperty( _rAggregateProps, PROPERTY_CLASSID ); - RemoveProperty( _rAggregateProps, PROPERTY_NAME ); - RemoveProperty( _rAggregateProps, PROPERTY_TAG ); - RemoveProperty( _rAggregateProps, PROPERTY_NATIVE_LOOK ); - DECL_PROP2(PERSISTENCE_MAXTEXTLENGTH,sal_Int16, READONLY, TRANSIENT); DECL_PROP2(DEFAULT_TEXT, ::rtl::OUString, BOUND, MAYBEDEFAULT); DECL_BOOL_PROP1(EMPTY_IS_NULL, BOUND); @@ -477,9 +460,18 @@ void OEditModel::fillProperties( } //------------------------------------------------------------------------------ -::cppu::IPropertyArrayHelper& OEditModel::getInfoHelper() +void OEditModel::describeAggregateProperties( Sequence< Property >& _rAggregateProps ) const { - return *const_cast<OEditModel*>(this)->getArrayHelper(); + OEditBaseModel::describeAggregateProperties( _rAggregateProps ); + + // our aggregate is a rich text model, which also derives from OControlModel, as + // do we, so we need to remove some duplicate properties + RemoveProperty( _rAggregateProps, PROPERTY_TABINDEX ); + RemoveProperty( _rAggregateProps, PROPERTY_CLASSID ); + RemoveProperty( _rAggregateProps, PROPERTY_NAME ); + RemoveProperty( _rAggregateProps, PROPERTY_TAG ); + RemoveProperty( _rAggregateProps, PROPERTY_NATIVE_LOOK ); + } //------------------------------------------------------------------------------ |