diff options
author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:35:14 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:35:14 +0000 |
commit | 3d3a0ece4def020ce0073fc73c50b3982d9fd306 (patch) | |
tree | 047240416771d5ad4e5bd4218bcd9b852e2b14d4 /forms/source/component | |
parent | 0cbe45439f496b3bfe50f8ed96139ede3a067bef (diff) |
INTEGRATION: CWS hb02 (1.7.80); FILE MERGED
2007/02/01 12:09:42 fs 1.7.80.2: #i74051# split describeFixedProperties in describeFixedProperties and describeAggregateProperties
2007/01/31 10:55:31 fs 1.7.80.1: changed handling of properties in the course of #i74051#
Diffstat (limited to 'forms/source/component')
-rw-r--r-- | forms/source/component/refvaluecomponent.hxx | 9 | ||||
-rw-r--r-- | forms/source/component/scrollbar.hxx | 15 | ||||
-rw-r--r-- | forms/source/component/spinbutton.hxx | 15 |
3 files changed, 14 insertions, 25 deletions
diff --git a/forms/source/component/refvaluecomponent.hxx b/forms/source/component/refvaluecomponent.hxx index e50164f933a7..a40cedecddef 100644 --- a/forms/source/component/refvaluecomponent.hxx +++ b/forms/source/component/refvaluecomponent.hxx @@ -4,9 +4,9 @@ * * $RCSfile: refvaluecomponent.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: hr $ $Date: 2006-06-19 12:56:13 $ + * last change: $Author: obo $ $Date: 2007-03-09 13:34:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -102,9 +102,8 @@ namespace frm 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); - 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 + virtual void describeFixedProperties( + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps ) const; using ::cppu::OPropertySetHelper::getFastPropertyValue; diff --git a/forms/source/component/scrollbar.hxx b/forms/source/component/scrollbar.hxx index 8fd9e618dcdc..cfd39df361cc 100644 --- a/forms/source/component/scrollbar.hxx +++ b/forms/source/component/scrollbar.hxx @@ -4,9 +4,9 @@ * * $RCSfile: scrollbar.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: hr $ $Date: 2006-06-19 12:56:36 $ + * last change: $Author: obo $ $Date: 2007-03-09 13:34:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -52,7 +52,6 @@ namespace frm //= OScrollBarModel //==================================================================== class OScrollBarModel :public OBoundControlModel - ,public ::comphelper::OAggregationArrayUsageHelper< OScrollBarModel > { private: // <properties> @@ -74,12 +73,9 @@ namespace frm // XPropertyState virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const; - // XPropertySet and related helpers - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - 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 + // OControlModel's property handling + virtual void describeFixedProperties( + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps ) const; // OPropertySetHelper @@ -109,7 +105,6 @@ namespace frm using OBoundControlModel::disposing; using OBoundControlModel::getFastPropertyValue; - IMPLEMENT_INFO_SERVICE() }; //........................................................................ } // namespacefrm diff --git a/forms/source/component/spinbutton.hxx b/forms/source/component/spinbutton.hxx index 38bf08fc8c64..4ab8ef10bf43 100644 --- a/forms/source/component/spinbutton.hxx +++ b/forms/source/component/spinbutton.hxx @@ -4,9 +4,9 @@ * * $RCSfile: spinbutton.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: hr $ $Date: 2006-06-19 12:56:59 $ + * last change: $Author: obo $ $Date: 2007-03-09 13:35:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -52,7 +52,6 @@ namespace frm //= OSpinButtonModel //==================================================================== class OSpinButtonModel :public OBoundControlModel - ,public ::comphelper::OAggregationArrayUsageHelper< OSpinButtonModel > { private: // <properties> @@ -74,12 +73,9 @@ namespace frm // XPropertyState virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const; - // XPropertySet and related helpers - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - 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 + // OControlModel's property handling + virtual void describeFixedProperties( + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps ) const; // OPropertySetHelper @@ -109,7 +105,6 @@ namespace frm using OBoundControlModel::disposing; using OBoundControlModel::getFastPropertyValue; - IMPLEMENT_INFO_SERVICE() }; //........................................................................ } // namespacefrm |