diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:25:24 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:25:24 +0000 |
| commit | 4b596010eebdd45a339e8d74f35f7b607b45b6f3 (patch) | |
| tree | fd4688661450b9676316903dceea9fdb364e8afd /forms/source/component/FixedText.hxx | |
| parent | 46bb81d061fec3f7b0126c2ae96b94d1614665c9 (diff) | |
INTEGRATION: CWS hb02 (1.5.164); FILE MERGED
2007/02/01 12:09:37 fs 1.5.164.2: #i74051# split describeFixedProperties in describeFixedProperties and describeAggregateProperties
2007/01/31 10:55:26 fs 1.5.164.1: changed handling of properties in the course of #i74051#
Diffstat (limited to 'forms/source/component/FixedText.hxx')
| -rw-r--r-- | forms/source/component/FixedText.hxx | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/forms/source/component/FixedText.hxx b/forms/source/component/FixedText.hxx index 0f5ae4c2c..226da321e 100644 --- a/forms/source/component/FixedText.hxx +++ b/forms/source/component/FixedText.hxx @@ -4,9 +4,9 @@ * * $RCSfile: FixedText.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-08 22:40:04 $ + * last change: $Author: obo $ $Date: 2007-03-09 13:25:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -49,15 +49,10 @@ namespace frm //================================================================== class OFixedTextModel :public OControlModel - ,public ::comphelper::OAggregationArrayUsageHelper< OFixedTextModel > { public: DECLARE_DEFAULT_LEAF_XTOR( OFixedTextModel ); -// 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(); - // XServiceInfo IMPLEMENTATION_NAME(OFixedTextModel); virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); @@ -69,12 +64,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 describeAggregateProperties( + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + ) const; protected: DECLARE_XCLONEABLE(); |