diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:31:07 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:31:07 +0000 |
| commit | 4e9056b74ca1e52f0c2399ec674be946c935e57b (patch) | |
| tree | f65ee2e58495136bc0131069139983a3e94afbf1 | |
| parent | 5e6613bd0b1a4ea23e3501d82c9c3a3be70dacc9 (diff) | |
INTEGRATION: CWS hb02 (1.7.164); FILE MERGED
2007/02/01 12:09:40 fs 1.7.164.2: #i74051# split describeFixedProperties in describeFixedProperties and describeAggregateProperties
2007/01/31 10:55:29 fs 1.7.164.1: changed handling of properties in the course of #i74051#
| -rw-r--r-- | forms/source/component/Pattern.hxx | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/forms/source/component/Pattern.hxx b/forms/source/component/Pattern.hxx index f2d6fdc53431..72ed981cb02c 100644 --- a/forms/source/component/Pattern.hxx +++ b/forms/source/component/Pattern.hxx @@ -4,9 +4,9 @@ * * $RCSfile: Pattern.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-08 22:46:19 $ + * last change: $Author: obo $ $Date: 2007-03-09 13:31:07 $ * * 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 OPatternModel :public OEditBaseModel - ,public ::comphelper::OAggregationArrayUsageHelper< OPatternModel > { private: ::rtl::OUString m_aSaveValue; @@ -60,10 +59,6 @@ protected: public: DECLARE_DEFAULT_LEAF_XTOR( OPatternModel ); - // ::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::lang::XServiceInfo IMPLEMENTATION_NAME(OPatternModel); virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); @@ -71,12 +66,10 @@ public: // ::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 |