User: rt Date: 2008-06-16 13:38:20+0000 Modified: dba/reportdesign/source/filter/xml/xmlfilter.cxx
Log: INTEGRATION: CWS rptchart02 (1.7.4); FILE MERGED 2008/06/10 06:42:51 oj 1.7.4.4: debug mode corrected 2008/04/16 06:29:22 oj 1.7.4.3: RESYNC: (1.7-1.8); FILE MERGED 2008/04/03 06:35:19 oj 1.7.4.2: #i86343# remove unused code 2008/03/12 09:45:17 oj 1.7.4.1: impl chart handling File Changes: Directory: /dba/reportdesign/source/filter/xml/ =============================================== File [changed]: xmlfilter.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlfilter.cxx?r1=1.8&r2=1.9 Delta lines: +5 -12 -------------------- --- xmlfilter.cxx 2008-04-10 18:46:44+0000 1.8 +++ xmlfilter.cxx 2008-06-16 13:38:17+0000 1.9 @@ -509,11 +509,11 @@ #if OSL_DEBUG_LEVEL > 1 uno::Reference < container::XNameAccess > xAccess( xStorage, uno::UNO_QUERY ); uno::Sequence< ::rtl::OUString> aSeq = xAccess->getElementNames(); - const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); - for(;pIter != pEnd;++pIter) + const ::rtl::OUString* pDebugIter = aSeq.getConstArray(); + const ::rtl::OUString* pDebugEnd = pDebugIter + aSeq.getLength(); + for(;pDebugIter != pDebugEnd;++pDebugIter) { - (void)*pIter; + (void)*pDebugIter; } #endif @@ -569,9 +569,7 @@ if ( bRet ) { - uno::Reference< XModifiable > xModi(GetModel(),UNO_QUERY); - if ( xModi.is() ) - xModi->setModified(sal_False); + m_xReportDefinition->setModified(sal_False); } else { @@ -784,8 +782,6 @@ { XML_NAMESPACE_FORM, XML_SIZE ,XML_TOK_SIZE }, { XML_NAMESPACE_FORM, XML_IMAGE_DATA ,XML_TOK_IMAGE_DATA }, { XML_NAMESPACE_REPORT, XML_SCALE ,XML_TOK_SCALE }, - { XML_NAMESPACE_FORM, XML_IMAGE_POSITION ,XML_TOK_IMAGE_POSITION }, - { XML_NAMESPACE_FORM, XML_IMAGE_ALIGN ,XML_TOK_IMAGE_ALIGN }, { XML_NAMESPACE_REPORT, XML_REPORT_ELEMENT ,XML_TOK_REPORT_ELEMENT }, { XML_NAMESPACE_REPORT, XML_FORMULA ,XML_TOK_DATA_FORMULA }, { XML_NAMESPACE_REPORT, XML_PRESERVE_IRI ,XML_TOK_PRESERVE_IRI }, @@ -989,9 +985,6 @@ m_pReportModel = reportdesign::OReportDefinition::getSdrModel(m_xReportDefinition); OSL_ENSURE(m_pReportModel,"Report model is NULL!"); - //uno::Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier = OXMLHelper::GetNumberFormatsSupplier(m_xReportDefinition); - //if ( xNumberFormatsSupplier.is() ) - // SetNumberFormatsSupplier(xNumberFormatsSupplier); SvXMLImport::startDocument(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
