User: kz      
Date: 2008-03-05 17:51:48+0000
Modified:
   dba/reportdesign/source/core/api/FixedText.cxx

Log:
 INTEGRATION: CWS rptchart01_DEV300 (1.2.70); FILE MERGED
 2008/02/13 07:12:46 oj 1.2.70.1: #i85225# impl chart readhandler and 
oleproducer

File Changes:

Directory: /dba/reportdesign/source/core/api/
=============================================

File [changed]: FixedText.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/api/FixedText.cxx?r1=1.2&r2=1.3
Delta lines:  +7 -6
-------------------
--- FixedText.cxx       2007-07-09 11:56:13+0000        1.2
+++ FixedText.cxx       2008-03-05 17:51:45+0000        1.3
@@ -77,7 +77,7 @@
        using namespace comphelper;
 uno::Sequence< ::rtl::OUString > lcl_getFixedTextOptionals()
 {
-       ::rtl::OUString pProps[] = { PROPERTY_DATAFIELD };
+       ::rtl::OUString pProps[] = { 
PROPERTY_DATAFIELD,PROPERTY_MASTERFIELDS,PROPERTY_DETAILFIELDS };
        return uno::Sequence< ::rtl::OUString 
>(pProps,sizeof(pProps)/sizeof(pProps[0]));
 }
 DBG_NAME( rpt_OFixedText )
@@ -179,8 +179,9 @@
 }
 // 
-----------------------------------------------------------------------------
 // XReportComponent
-REPORTCOMPONENT_IMPL(OFixedText)
-REPORTCOMPONENT_IMPL2(OFixedText)
+REPORTCOMPONENT_IMPL(OFixedText,m_aProps.aComponent)
+REPORTCOMPONENT_IMPL2(OFixedText,m_aProps.aComponent)
+REPORTCOMPONENT_NOMASTERDETAIL(OFixedText)
 REPORTCONTROLFORMAT_IMPL(OFixedText,m_aProps.aFormatProperties)
 // 
-----------------------------------------------------------------------------
 uno::Reference< beans::XPropertySetInfo > SAL_CALL 
OFixedText::getPropertySetInfo(  ) throw(uno::RuntimeException)




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to