INTEGRATION: CWS hb02 (1.24.28); FILE MERGED

2007/02/01 12:09:41 fs 1.24.28.2: #i74051# split describeFixedProperties in describeFixedProperties and describeAggregateProperties
2007/01/31 10:55:30 fs 1.24.28.1: changed handling of properties in the course of #i74051#
This commit is contained in:
Oliver Bolte
2007-03-09 12:31:56 +00:00
parent 1f78e60120
commit 3c3fcf658a

View File

@@ -4,9 +4,9 @@
*
* $RCSfile: Time.cxx,v $
*
* $Revision: 1.24 $
* $Revision: 1.25 $
*
* last change: $Author: vg $ $Date: 2006-11-21 17:41:02 $
* last change: $Author: obo $ $Date: 2007-03-09 13:31:56 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -194,16 +194,7 @@ IMPLEMENT_DEFAULT_CLONING( OTimeModel )
// XPropertySet
//------------------------------------------------------------------------------
Reference<XPropertySetInfo> SAL_CALL OTimeModel::getPropertySetInfo() throw( RuntimeException )
{
Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) );
return xInfo;
}
//------------------------------------------------------------------------------
void OTimeModel::fillProperties(
Sequence< Property >& _rProps,
Sequence< Property >& _rAggregateProps ) const
void OTimeModel::describeFixedProperties( Sequence< Property >& _rProps ) const
{
BEGIN_DESCRIBE_PROPERTIES( 4, OEditBaseModel )
DECL_PROP3(DEFAULT_TIME, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID);
@@ -213,12 +204,6 @@ void OTimeModel::fillProperties(
END_DESCRIBE_PROPERTIES();
}
//------------------------------------------------------------------------------
::cppu::IPropertyArrayHelper& OTimeModel::getInfoHelper()
{
return *const_cast<OTimeModel*>(this)->getArrayHelper();
}
//------------------------------------------------------------------------------
void SAL_CALL OTimeModel::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle ) const
{