User: kz Date: 2008-03-05 17:52:06+0000 Modified: dba/reportdesign/source/core/api/FormattedField.cxx
Log: INTEGRATION: CWS rptchart01_DEV300 (1.3.62); FILE MERGED 2008/02/13 07:12:46 oj 1.3.62.1: #i85225# impl chart readhandler and oleproducer File Changes: Directory: /dba/reportdesign/source/core/api/ ============================================= File [changed]: FormattedField.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/api/FormattedField.cxx?r1=1.3&r2=1.4 Delta lines: +10 -4 -------------------- --- FormattedField.cxx 2007-08-02 14:29:38+0000 1.3 +++ FormattedField.cxx 2008-03-05 17:52:04+0000 1.4 @@ -84,11 +84,16 @@ return *(new OFormattedField(xContext)); } +uno::Sequence< ::rtl::OUString > lcl_getFormattedFieldOptionals() +{ + ::rtl::OUString pProps[] = { PROPERTY_MASTERFIELDS,PROPERTY_DETAILFIELDS }; + return uno::Sequence< ::rtl::OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); +} DBG_NAME( rpt_OFormattedField ) // ----------------------------------------------------------------------------- OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const & _xContext) :FormattedFieldBase(m_aMutex) -,FormattedFieldPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< ::rtl::OUString >()) +,FormattedFieldPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getFormattedFieldOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nFormatKey(0) { @@ -100,7 +105,7 @@ ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory ,uno::Reference< drawing::XShape >& _xShape) :FormattedFieldBase(m_aMutex) -,FormattedFieldPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< ::rtl::OUString >()) +,FormattedFieldPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getFormattedFieldOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nFormatKey(0) { @@ -177,8 +182,9 @@ } // ----------------------------------------------------------------------------- // XReportComponent -REPORTCOMPONENT_IMPL(OFormattedField) -REPORTCOMPONENT_IMPL2(OFormattedField) +REPORTCOMPONENT_IMPL(OFormattedField,m_aProps.aComponent) +REPORTCOMPONENT_IMPL2(OFormattedField,m_aProps.aComponent) +REPORTCOMPONENT_NOMASTERDETAIL(OFormattedField) REPORTCONTROLFORMAT_IMPL(OFormattedField,m_aProps.aFormatProperties) // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
