diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:22:37 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:22:37 +0000 |
| commit | f3a31503d58fddb071f8d99f1c4bcd7103c60e8e (patch) | |
| tree | 80e90154b9723502cecb1b273148ec43114190bb | |
| parent | 44b5c4a5c878c45aa5a9cec5bc7364b9edf2a24c (diff) | |
INTEGRATION: CWS hb02 (1.7.164); FILE MERGED
2007/02/01 12:09:36 fs 1.7.164.2: #i74051# split describeFixedProperties in describeFixedProperties and describeAggregateProperties
2007/01/31 10:55:24 fs 1.7.164.1: changed handling of properties in the course of #i74051#
| -rw-r--r-- | forms/source/component/Currency.hxx | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/forms/source/component/Currency.hxx b/forms/source/component/Currency.hxx index b9d1126be2ee..b6288bdf2ce9 100644 --- a/forms/source/component/Currency.hxx +++ b/forms/source/component/Currency.hxx @@ -4,9 +4,9 @@ * * $RCSfile: Currency.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-08 22:36:05 $ + * last change: $Author: obo $ $Date: 2007-03-09 13:22:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -50,7 +50,6 @@ namespace frm //================================================================== class OCurrencyModel :public OEditBaseModel - ,public ::comphelper::OAggregationArrayUsageHelper< OCurrencyModel > { ::com::sun::star::uno::Any m_aSaveValue; @@ -64,19 +63,13 @@ public: IMPLEMENTATION_NAME(OCurrencyModel); 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); - // 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: // OBoundControlModel overridables |