diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:27:20 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:27:20 +0000 |
| commit | 85fe3e8e648dce4f1f0ac55fdc2c073c848bf91a (patch) | |
| tree | d195fc9980359bcc8437ec18b552a9e64ffae99f /forms/source/component/GroupBox.cxx | |
| parent | c532e4bb123a393f89239220adda045d0d857a61 (diff) | |
INTEGRATION: CWS hb02 (1.8.52); FILE MERGED
2007/02/01 12:09:38 fs 1.8.52.2: #i74051# split describeFixedProperties in describeFixedProperties and describeAggregateProperties
2007/01/31 10:55:27 fs 1.8.52.1: changed handling of properties in the course of #i74051#
Diffstat (limited to 'forms/source/component/GroupBox.cxx')
| -rw-r--r-- | forms/source/component/GroupBox.cxx | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx index 89286bede3fa..3af89817b13c 100644 --- a/forms/source/component/GroupBox.cxx +++ b/forms/source/component/GroupBox.cxx @@ -4,9 +4,9 @@ * * $RCSfile: GroupBox.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: obo $ $Date: 2006-09-16 23:50:56 $ + * last change: $Author: obo $ $Date: 2007-03-09 13:26:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -116,24 +116,9 @@ OGroupBoxModel::~OGroupBoxModel() IMPLEMENT_DEFAULT_CLONING( OGroupBoxModel ) //------------------------------------------------------------------------------ -Reference<XPropertySetInfo> SAL_CALL OGroupBoxModel::getPropertySetInfo() throw(RuntimeException) +void OGroupBoxModel::describeAggregateProperties( Sequence< Property >& _rAggregateProps ) const { - Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); - return xInfo; -} - -//------------------------------------------------------------------------------ -cppu::IPropertyArrayHelper& OGroupBoxModel::getInfoHelper() -{ - return *const_cast<OGroupBoxModel*>(this)->getArrayHelper(); -} - -//------------------------------------------------------------------------------ -void OGroupBoxModel::fillProperties( - Sequence< Property >& _rProps, - Sequence< Property >& _rAggregateProps ) const -{ - OControlModel::fillProperties( _rProps, _rAggregateProps ); + OControlModel::describeAggregateProperties( _rAggregateProps ); // don't want to have the TabStop property RemoveProperty(_rAggregateProps, PROPERTY_TABSTOP); } |