diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:29:39 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:29:39 +0000 |
| commit | 22717adbc84e18a60c33ba12debfa9c45c1f21b4 (patch) | |
| tree | 55f277cd39c45a5ec5ed0aae2cca5ff1e3224b65 /forms/source/component/ListBox.hxx | |
| parent | 2039eeef18c80a8c3bee40848c97409ec5239e88 (diff) | |
INTEGRATION: CWS hb02 (1.16.32); FILE MERGED
2007/02/06 10:30:32 hbrinkm 1.16.32.3: RESYNC: (1.16-1.17); FILE MERGED
2007/02/01 12:09:40 fs 1.16.32.2: #i74051# split describeFixedProperties in describeFixedProperties and describeAggregateProperties
2007/01/31 10:55:29 fs 1.16.32.1: changed handling of properties in the course of #i74051#
Diffstat (limited to 'forms/source/component/ListBox.hxx')
| -rw-r--r-- | forms/source/component/ListBox.hxx | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx index 93fbd64a0f7f..060905eac053 100644 --- a/forms/source/component/ListBox.hxx +++ b/forms/source/component/ListBox.hxx @@ -4,9 +4,9 @@ * * $RCSfile: ListBox.hxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: vg $ $Date: 2007-01-15 13:47:14 $ + * last change: $Author: obo $ $Date: 2007-03-09 13:29:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -102,7 +102,6 @@ class OListBoxModel :public OBoundControlModel ,public OListBoxModel_BASE ,public OEntryListHelper ,public OErrorBroadcaster - ,public ::comphelper::OAggregationArrayUsageHelper< OListBoxModel > { ::com::sun::star::uno::Any m_aSaveValue; @@ -159,10 +158,6 @@ public: throw (::com::sun::star::lang::IllegalArgumentException); protected: - // 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(); - // XMultiPropertySet virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -178,12 +173,13 @@ protected: virtual void SAL_CALL addRefreshListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeRefreshListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener>& _rxListener) throw(::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 describeFixedProperties( + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps + ) const; + virtual void describeAggregateProperties( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps - ) const; - IMPLEMENT_INFO_SERVICE() + ) const; // XEventListener virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException); |