diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:26:40 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:26:40 +0000 |
| commit | 0f26eece37fe3379639dbe58169c3361664487d4 (patch) | |
| tree | dd30547df0d3e35176e2d4bc8cd59c909d5f1a4e /forms/source/component/Grid.hxx | |
| parent | aef8e69efb600c3016f40e62cc9ec35ab4cf469c (diff) | |
INTEGRATION: CWS hb02 (1.19.80); FILE MERGED
2007/02/01 12:09:38 fs 1.19.80.2: #i74051# split describeFixedProperties in describeFixedProperties and describeAggregateProperties
2007/01/31 10:55:27 fs 1.19.80.1: changed handling of properties in the course of #i74051#
Diffstat (limited to 'forms/source/component/Grid.hxx')
| -rw-r--r-- | forms/source/component/Grid.hxx | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx index 7cf55dcea..205cc3d33 100644 --- a/forms/source/component/Grid.hxx +++ b/forms/source/component/Grid.hxx @@ -4,9 +4,9 @@ * * $RCSfile: Grid.hxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: hr $ $Date: 2006-06-19 12:50:33 $ + * last change: $Author: obo $ $Date: 2007-03-09 13:26:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -100,10 +100,6 @@ class OGridControlModel :public OControlModel ,public OInterfaceContainer ,public OErrorBroadcaster ,public FontControlModel - ,public OAggregationArrayUsageHelper< OGridControlModel > - // though we don't use aggregation, we're derived from an OPropertySetAggregationHelper, - // which expects that we use an OPropertyArrayAggregationHelper, which we ensure - // with deriving from OAggregationArrayUsageHelper ,public OGridControlModel_BASE { ::cppu::OInterfaceContainerHelper m_aSelectListeners, @@ -187,8 +183,6 @@ 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); // 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(); virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) @@ -201,12 +195,10 @@ public: // XSQLErrorListener virtual void SAL_CALL errorOccured( const ::com::sun::star::sdb::SQLErrorEvent& _rEvent ) throw (::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::disposing; |