User: rt Date: 2008-06-16 13:37:17+0000 Modified: dba/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
Log: INTEGRATION: CWS rptchart02 (1.2.4); FILE MERGED 2008/04/16 06:29:14 oj 1.2.4.3: RESYNC: (1.2-1.3); FILE MERGED 2008/04/15 08:34:44 oj 1.2.4.2: #i88295# handle copy n paste 2008/03/12 09:45:17 oj 1.2.4.1: impl chart handling File Changes: Directory: /dba/reportdesign/source/filter/xml/ =============================================== File [changed]: xmlImportDocumentHandler.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx?r1=1.3&r2=1.4 Delta lines: +11 -3 -------------------- --- xmlImportDocumentHandler.cxx 2008-04-10 18:39:52+0000 1.3 +++ xmlImportDocumentHandler.cxx 2008-06-16 13:37:14+0000 1.4 @@ -124,7 +124,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & _xAttrList) throw (uno::RuntimeException, xml::sax::SAXException) { - + uno::Reference< xml::sax::XAttributeList > xNewAttribs = _xAttrList; bool bExport = true; if ( _sName.equalsAscii("office:report") ) { @@ -166,10 +166,11 @@ break; } } + m_xDatabaseDataProvider->execute(); } catch(uno::Exception&) { - OSL_ENSURE(0,"Exception catched while filling the report definition props"); + // OSL_ENSURE(0,"Exception catched while filling the report definition props"); } m_xDelegatee->startElement(lcl_createAttribute(XML_NP_OFFICE,XML_CHART),NULL); bExport = false; @@ -220,9 +221,16 @@ || _sName.equalsAscii("rpt:report-component") || _sName.equalsAscii("rpt:report-element")) bExport = false; + else if ( _sName.equalsAscii("chart:plot-area")) + { + SvXMLAttributeList* pList = new SvXMLAttributeList(); + xNewAttribs = pList; + pList->AppendAttributeList(_xAttrList); + pList->AddAttribute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("table:cell-range-address")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("local-table.$A$1:.$Z$65536"))); + } if ( bExport ) - m_xDelegatee->startElement(_sName,_xAttrList); + m_xDelegatee->startElement(_sName,xNewAttribs); } void SAL_CALL ImportDocumentHandler::endElement(const ::rtl::OUString & _sName) throw (uno::RuntimeException, xml::sax::SAXException) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
