strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS hb02 (1.4.80); FILE MERGED

Browse source 
2007/02/01 12:09:41 fs 1.4.80.2: #i74051# split describeFixedProperties in describeFixedProperties and describeAggregateProperties
2007/01/31 10:55:30 fs 1.4.80.1: changed handling of properties in the course of #i74051#
This commit is contained in:
Oliver Bolte 2007-03-09 12:33:37 +00:00
parent 640acfbfb6
commit 9cac9e996a
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
forms/source/component/navigationbar.hxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: navigationbar.hxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: hr $ $Date: 2006-06-19 12:55:47 $
* last change: $Author: obo $ $Date: 2007-03-09 13:33:37 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -82,10 +82,6 @@ namespace frm
:public OControlModel
,public FontControlModel
,public OPropertyContainerHelper
,public OAggregationArrayUsageHelper< ONavigationBarModel >
// though we don't use aggregation, we're derived from an OPropertySetAggregationHelper,
// which expects that we use an OPropertyArrayAggregationHelper, which we ensure
// with deriving from OAggregationArrayUsageHelper
,public ONavigationBarModel_BASE
{
// <properties>
@ -133,8 +129,6 @@ namespace frm
virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
// 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 void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const;
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 )
@ -144,12 +138,10 @@ namespace frm
// XPropertyState
virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const;
// 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;