diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:20:59 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:20:59 +0000 |
| commit | 106736d7363b42c20c40483f8030cc94e47811b8 (patch) | |
| tree | 25eb6d69fa1c9994fae8254bfe576558b872e590 /forms | |
| parent | 308c2c8f74e6f722b87812018f9bcd84f33611b2 (diff) | |
INTEGRATION: CWS hb02 (1.9.164); FILE MERGED
2007/02/01 12:09:35 fs 1.9.164.2: #i74051# split describeFixedProperties in describeFixedProperties and describeAggregateProperties
2007/01/31 10:55:23 fs 1.9.164.1: changed handling of properties in the course of #i74051#
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/CheckBox.hxx | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/forms/source/component/CheckBox.hxx b/forms/source/component/CheckBox.hxx index eb399900f11f..01df081038c5 100644 --- a/forms/source/component/CheckBox.hxx +++ b/forms/source/component/CheckBox.hxx @@ -4,9 +4,9 @@ * * $RCSfile: CheckBox.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: rt $ $Date: 2005-09-08 22:34:33 $ + * last change: $Author: obo $ $Date: 2007-03-09 13:20:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -48,7 +48,6 @@ namespace frm //= OCheckBoxModel //================================================================== class OCheckBoxModel :public OReferenceValueComponent - ,public ::comphelper::OAggregationArrayUsageHelper< OCheckBoxModel > { protected: sal_Int16 getState(const ::com::sun::star::uno::Any& rValue); @@ -60,10 +59,6 @@ public: IMPLEMENTATION_NAME(OCheckBoxModel); virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - // XPropertySetRef - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - // XPersistObject virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL @@ -71,12 +66,10 @@ public: virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - // OAggregationArrayUsageHelper - virtual void fillProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps, - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps - ) const; - IMPLEMENT_INFO_SERVICE() + // OControlModel's property handling + virtual void describeFixedProperties( + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + ) const; protected: DECLARE_XCLONEABLE(); |