INTEGRATION: CWS hb02 (1.15.52); FILE MERGED

2007/02/01 12:09:36 fs 1.15.52.2: #i74051# split describeFixedProperties in describeFixedProperties and describeAggregateProperties
2007/01/31 10:55:24 fs 1.15.52.1: changed handling of properties in the course of #i74051#
This commit is contained in:
Oliver Bolte
2007-03-09 12:22:22 +00:00
parent 334d07b096
commit 44b5c4a5c8

View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: Currency.cxx,v $ * $RCSfile: Currency.cxx,v $
* *
* $Revision: 1.15 $ * $Revision: 1.16 $
* *
* last change: $Author: obo $ $Date: 2006-09-16 23:47:46 $ * last change: $Author: obo $ $Date: 2007-03-09 13:22:22 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -213,16 +213,7 @@ StringSequence SAL_CALL OCurrencyModel::getSupportedServiceNames() throw()
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Reference<XPropertySetInfo> SAL_CALL OCurrencyModel::getPropertySetInfo() throw( RuntimeException ) void OCurrencyModel::describeFixedProperties( Sequence< Property >& _rProps ) const
{
Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) );
return xInfo;
}
//------------------------------------------------------------------------------
void OCurrencyModel::fillProperties(
Sequence< Property >& _rProps,
Sequence< Property >& _rAggregateProps ) const
{ {
BEGIN_DESCRIBE_PROPERTIES( 2, OEditBaseModel ) BEGIN_DESCRIBE_PROPERTIES( 2, OEditBaseModel )
// Value auf transient setzen // Value auf transient setzen
@@ -233,12 +224,6 @@ void OCurrencyModel::fillProperties(
END_DESCRIBE_PROPERTIES(); END_DESCRIBE_PROPERTIES();
} }
//------------------------------------------------------------------------------
::cppu::IPropertyArrayHelper& OCurrencyModel::getInfoHelper()
{
return *const_cast<OCurrencyModel*>(this)->getArrayHelper();
}
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
::rtl::OUString SAL_CALL OCurrencyModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) ::rtl::OUString SAL_CALL OCurrencyModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
{ {