diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:28:02 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:28:02 +0000 |
| commit | dd1a843463083662c1b10c82ee710d7262361ab2 (patch) | |
| tree | 387d11063e0efdcbaba42b4eba44191a02d42bbc /forms/source/component/ImageButton.hxx | |
| parent | 96880a56b5e2a4b0a1edae729ff08f1fd39bb270 (diff) | |
INTEGRATION: CWS hb02 (1.8.80); FILE MERGED
2007/02/01 12:09:39 fs 1.8.80.2: #i74051# split describeFixedProperties in describeFixedProperties and describeAggregateProperties
2007/01/31 10:55:28 fs 1.8.80.1: changed handling of properties in the course of #i74051#
Diffstat (limited to 'forms/source/component/ImageButton.hxx')
| -rw-r--r-- | forms/source/component/ImageButton.hxx | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/forms/source/component/ImageButton.hxx b/forms/source/component/ImageButton.hxx index 5b084bc00ff0..d5b8a5e7fb80 100644 --- a/forms/source/component/ImageButton.hxx +++ b/forms/source/component/ImageButton.hxx @@ -4,9 +4,9 @@ * * $RCSfile: ImageButton.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hr $ $Date: 2006-06-19 12:51:34 $ + * last change: $Author: obo $ $Date: 2007-03-09 13:28:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -54,7 +54,6 @@ namespace frm //================================================================== class OImageButtonModel :public OClickableImageBaseModel - ,public ::comphelper::OAggregationArrayUsageHelper< OImageButtonModel > { public: DECLARE_DEFAULT_LEAF_XTOR( OImageButtonModel ); @@ -63,21 +62,15 @@ public: IMPLEMENTATION_NAME(OImageButtonModel); virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); -// ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> - 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(); - // ::com::sun::star::io::XPersistObject virtual ::rtl::OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); 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(); |