INTEGRATION: CWS hb02 (1.7.164); FILE MERGED

2007/02/01 12:09:43 fs 1.7.164.2: #i74051# split describeFixedProperties in describeFixedProperties and describeAggregateProperties
2007/01/31 10:55:48 fs 1.7.164.1: #i74051# fillProperties -> describeFixedProperties
This commit is contained in:
Oliver Bolte 2007-03-09 12:35:48 +00:00
parent 276c548e0a
commit 666b96df01

View file

@ -4,9 +4,9 @@
*
* $RCSfile: property.hxx,v $
*
* $Revision: 1.7 $
* $Revision: 1.8 $
*
* last change: $Author: rt $ $Date: 2005-09-08 22:59:16 $
* last change: $Author: obo $ $Date: 2007-03-09 13:35:48 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -148,11 +148,16 @@ public:
//------------------------------------------------------------------------------
#define BEGIN_DESCRIBE_PROPERTIES( count, baseclass ) \
baseclass::fillProperties( _rProps, _rAggregateProps ); \
baseclass::describeFixedProperties( _rProps ); \
sal_Int32 nOldCount = _rProps.getLength(); \
_rProps.realloc( nOldCount + ( count ) ); \
::com::sun::star::beans::Property* pProperties = _rProps.getArray() + nOldCount; \
//------------------------------------------------------------------------------
#define BEGIN_DESCRIBE_BASE_PROPERTIES( count ) \
_rProps.realloc( count ); \
::com::sun::star::beans::Property* pProperties = _rProps.getArray(); \
//------------------------------------------------------------------------------
#define BEGIN_DESCRIBE_AGGREGATION_PROPERTIES( count, aggregate ) \
_rProps.realloc( count ); \
@ -224,7 +229,7 @@ public:
// ===
//------------------------------------------------------------------------------
#define END_DESCRIBE_PROPERTIES() \
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(), "<...>::fillProperties/getInfoHelper: forgot to adjust the count ?"); \
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(), "<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?"); \
//==============================================================================
//------------------------------------------------------------------------------