diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:27:34 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:27:34 +0000 |
| commit | 9b3f973d09dbffe2c4dd896661b5de5459bcf1d5 (patch) | |
| tree | 6ec04ab43388ede0d1fa4bb165d006ecefcdfb72 /forms/source/component/Hidden.hxx | |
| parent | 85fe3e8e648dce4f1f0ac55fdc2c073c848bf91a (diff) | |
INTEGRATION: CWS hb02 (1.6.80); FILE MERGED
2007/02/01 12:09:39 fs 1.6.80.2: #i74051# split describeFixedProperties in describeFixedProperties and describeAggregateProperties
2007/01/31 10:55:28 fs 1.6.80.1: changed handling of properties in the course of #i74051#
Diffstat (limited to 'forms/source/component/Hidden.hxx')
| -rw-r--r-- | forms/source/component/Hidden.hxx | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/forms/source/component/Hidden.hxx b/forms/source/component/Hidden.hxx index 45bec299f912..481612bfbca6 100644 --- a/forms/source/component/Hidden.hxx +++ b/forms/source/component/Hidden.hxx @@ -4,9 +4,9 @@ * * $RCSfile: Hidden.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2006-06-19 12:51:11 $ + * last change: $Author: obo $ $Date: 2007-03-09 13:27:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -49,7 +49,6 @@ namespace frm //================================================================== class OHiddenModel :public OControlModel - ,public ::comphelper::OAggregationArrayUsageHelper< OHiddenModel > { ::rtl::OUString m_sHiddenValue; @@ -64,10 +63,6 @@ public: ::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::lang::IllegalArgumentException); - // 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(OHiddenModel); virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); @@ -79,12 +74,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; // prevent method hiding using OControlModel::getFastPropertyValue; |