diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:19:54 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:19:54 +0000 |
| commit | b631a973d8807d91e208519e956a882502115ef8 (patch) | |
| tree | 2356f35ccd8bb8ba1dcb3c08f50a78dfb15e7e7e /forms/source/component/Button.cxx | |
| parent | INTEGRATION: CWS hb02 (1.1.2); FILE ADDED (diff) | |
| download | core-b631a973d8807d91e208519e956a882502115ef8.tar.gz core-b631a973d8807d91e208519e956a882502115ef8.zip | |
INTEGRATION: CWS hb02 (1.20.52); FILE MERGED
2007/02/01 12:09:35 fs 1.20.52.2: #i74051# split describeFixedProperties in describeFixedProperties and describeAggregateProperties
2007/01/31 10:55:23 fs 1.20.52.1: changed handling of properties in the course of #i74051#
Diffstat (limited to 'forms/source/component/Button.cxx')
| -rw-r--r-- | forms/source/component/Button.cxx | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index 173a674be052..5f85b279ec5f 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -4,9 +4,9 @@ * * $RCSfile: Button.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: obo $ $Date: 2006-09-16 23:46:53 $ + * last change: $Author: obo $ $Date: 2007-03-09 13:19:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -114,16 +114,7 @@ OButtonModel::~OButtonModel() } //------------------------------------------------------------------------------ -Reference<XPropertySetInfo> SAL_CALL OButtonModel::getPropertySetInfo() throw( RuntimeException ) -{ - Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); - return xInfo; -} - -//------------------------------------------------------------------------------ -void OButtonModel::fillProperties( - Sequence< Property >& _rProps, - Sequence< Property >& _rAggregateProps ) const +void OButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 5, OClickableImageBaseModel ) DECL_PROP1(BUTTONTYPE, FormButtonType, BOUND); @@ -135,12 +126,6 @@ void OButtonModel::fillProperties( } //------------------------------------------------------------------------------ -::cppu::IPropertyArrayHelper& OButtonModel::getInfoHelper() -{ - return *const_cast<OButtonModel*>(this)->getArrayHelper(); -} - -//------------------------------------------------------------------------------ IMPLEMENT_DEFAULT_CLONING( OButtonModel ) // XServiceInfo |