diff options
author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:27:04 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:27:04 +0000 |
commit | c532e4bb123a393f89239220adda045d0d857a61 (patch) | |
tree | 70d6fc44ac97d12377adb2a47b079dbaf3ef787f /forms/source/component/GroupBox.hxx | |
parent | INTEGRATION: CWS hb02 (1.19.80); FILE MERGED (diff) | |
download | core-c532e4bb123a393f89239220adda045d0d857a61.tar.gz core-c532e4bb123a393f89239220adda045d0d857a61.zip |
INTEGRATION: CWS hb02 (1.6.164); FILE MERGED
2007/02/01 12:09:38 fs 1.6.164.2: #i74051# split describeFixedProperties in describeFixedProperties and describeAggregateProperties
2007/01/31 10:55:27 fs 1.6.164.1: changed handling of properties in the course of #i74051#
Diffstat (limited to 'forms/source/component/GroupBox.hxx')
-rw-r--r-- | forms/source/component/GroupBox.hxx | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/forms/source/component/GroupBox.hxx b/forms/source/component/GroupBox.hxx index 72ddd3a5a4cc..5752d994cc50 100644 --- a/forms/source/component/GroupBox.hxx +++ b/forms/source/component/GroupBox.hxx @@ -4,9 +4,9 @@ * * $RCSfile: GroupBox.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2005-09-08 22:42:42 $ + * last change: $Author: obo $ $Date: 2007-03-09 13:27:04 $ * * 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 OGroupBoxModel :public OControlModel - ,public ::comphelper::OAggregationArrayUsageHelper< OGroupBoxModel > { public: DECLARE_DEFAULT_LEAF_XTOR( OGroupBoxModel ); @@ -58,10 +57,6 @@ public: IMPLEMENTATION_NAME(OGroupBoxModel); 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 @@ -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, + // OControlModel's property handling + virtual void describeAggregateProperties( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps - ) const; - IMPLEMENT_INFO_SERVICE() + ) const; protected: DECLARE_XCLONEABLE(); |