diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:24:52 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:24:52 +0000 |
| commit | f424ac409c42dcc9c01025f1ecbf5ac323ac4e21 (patch) | |
| tree | f2a7b28cb053cf743739cf31acd625305c929f8d /forms | |
| parent | e37046ea8d4d5962fe162702e22d17075aad4159 (diff) | |
INTEGRATION: CWS hb02 (1.7.80); FILE MERGED
2007/02/01 12:09:37 fs 1.7.80.3: #i74051# split describeFixedProperties in describeFixedProperties and describeAggregateProperties
2007/01/31 13:55:22 fs 1.7.80.2: consolidated default handling during #i74051#
2007/01/31 10:55:26 fs 1.7.80.1: changed handling of properties in the course of #i74051#
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/File.hxx | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/forms/source/component/File.hxx b/forms/source/component/File.hxx index 9144765c15ee..7d2ba263767b 100644 --- a/forms/source/component/File.hxx +++ b/forms/source/component/File.hxx @@ -4,9 +4,9 @@ * * $RCSfile: File.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: hr $ $Date: 2006-06-19 12:48:32 $ + * last change: $Author: obo $ $Date: 2007-03-09 13:24:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -51,7 +51,6 @@ namespace frm class OFileControlModel :public OControlModel ,public ::com::sun::star::form::XReset - ,public ::comphelper::OAggregationArrayUsageHelper< OFileControlModel > { ::cppu::OInterfaceContainerHelper m_aResetListeners; ::rtl::OUString m_sDefaultValue; @@ -72,15 +71,14 @@ public: // OComponentHelper virtual void SAL_CALL disposing(); + // XPropertySet and friends virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const; virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw ( ::com::sun::star::uno::Exception); 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 ) throw(::com::sun::star::lang::IllegalArgumentException); - // 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 ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const; // XPersistObject virtual ::rtl::OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); @@ -92,12 +90,10 @@ public: virtual void SAL_CALL addResetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeResetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener>& _rxListener) 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; |