diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:25:06 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:25:06 +0000 |
| commit | 46bb81d061fec3f7b0126c2ae96b94d1614665c9 (patch) | |
| tree | 4fa6f0da5eed9bfc24ae3a0099b3f83b56e8f64b | |
| parent | f8ef181ee8676731590659a26889b59c8005a5e5 (diff) | |
INTEGRATION: CWS hb02 (1.8.52); FILE MERGED
2007/02/01 12:09:37 fs 1.8.52.2: #i74051# split describeFixedProperties in describeFixedProperties and describeAggregateProperties
2007/01/31 10:55:26 fs 1.8.52.1: changed handling of properties in the course of #i74051#
| -rw-r--r-- | forms/source/component/FixedText.cxx | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx index dd72203e1..5f5416180 100644 --- a/forms/source/component/FixedText.cxx +++ b/forms/source/component/FixedText.cxx @@ -4,9 +4,9 @@ * * $RCSfile: FixedText.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: obo $ $Date: 2006-09-16 23:49:35 $ + * last change: $Author: obo $ $Date: 2007-03-09 13:25:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -114,24 +114,9 @@ StringSequence SAL_CALL OFixedTextModel::getSupportedServiceNames() throw(::com: } //------------------------------------------------------------------------------ -Reference<starbeans::XPropertySetInfo> SAL_CALL OFixedTextModel::getPropertySetInfo() throw(RuntimeException) +void OFixedTextModel::describeAggregateProperties( Sequence< Property >& _rAggregateProps ) const { - Reference<starbeans::XPropertySetInfo> xInfo(createPropertySetInfo(getInfoHelper())); - return xInfo; -} - -//------------------------------------------------------------------------------ -cppu::IPropertyArrayHelper& OFixedTextModel::getInfoHelper() -{ - return *const_cast<OFixedTextModel*>(this)->getArrayHelper(); -} - -//------------------------------------------------------------------------------ -void OFixedTextModel::fillProperties( - Sequence< starbeans::Property >& _rProps, - Sequence< starbeans::Property >& _rAggregateProps ) const -{ - OControlModel::fillProperties( _rProps, _rAggregateProps ); + OControlModel::describeAggregateProperties( _rAggregateProps ); RemoveProperty( _rAggregateProps, PROPERTY_TABSTOP ); } |