Tag: cws_src680_reportdesign01 User: oj Date: 2007-09-20 10:13:04+0000 Modified: dba/reportdesign/source/filter/xml/xmlEnums.hxx dba/reportdesign/source/filter/xml/xmlExport.cxx dba/reportdesign/source/filter/xml/xmlReport.cxx dba/reportdesign/source/filter/xml/xmlfilter.cxx
Log: #i79167# preserveIRI corrected File Changes: Directory: /dba/reportdesign/source/filter/xml/ =============================================== File [changed]: xmlEnums.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlEnums.hxx?r1=1.2&r2=1.2.28.1 Delta lines: +4 -3 ------------------- --- xmlEnums.hxx 2007-07-09 11:56:17+0000 1.2 +++ xmlEnums.hxx 2007-09-20 10:13:00+0000 1.2.28.1 @@ -6,9 +6,9 @@ * * $RCSfile: xmlEnums.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.28.1 $ * - * last change: $Author: rt $ $Date: 2007/07/09 11:56:17 $ + * last change: $Author: oj $ $Date: 2007/09/20 10:13:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -65,7 +65,8 @@ XML_TOK_ESCAPE_PROCESSING , XML_TOK_REPORT_FUNCTION , XML_TOK_REPORT_ELEMENT , - XML_TOK_REPORT_MIMETYPE + XML_TOK_REPORT_MIMETYPE , + XML_TOK_REPORT_NAME }; enum XMLGroup { File [changed]: xmlExport.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlExport.cxx?r1=1.5&r2=1.5.20.1 Delta lines: +13 -7 -------------------- --- xmlExport.cxx 2007-08-06 10:47:23+0000 1.5 +++ xmlExport.cxx 2007-09-20 10:13:01+0000 1.5.20.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlExport.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.5.20.1 $ * - * last change: $Author: hr $ $Date: 2007/08/06 10:47:23 $ + * last change: $Author: oj $ $Date: 2007/09/20 10:13:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -994,6 +994,7 @@ { Reference<XReportControlModel> xReportElement(xElement,uno::UNO_QUERY); Reference<XReportDefinition> xReportDefinition(xElement,uno::UNO_QUERY); + Reference< XImageControl > xImage(xElement,uno::UNO_QUERY); Reference<XSection> xSection(xElement,uno::UNO_QUERY); XMLTokenEnum eToken = XML_SECTION; @@ -1010,15 +1011,15 @@ else if ( xElement->supportsService(SERVICE_IMAGECONTROL) ) { eToken = XML_IMAGE; - Reference< XImageControl > xProp(xElement,uno::UNO_QUERY); - ::rtl::OUString sTargetLocation = xProp->getImageURL(); + Reference< XImageControl > xImage(xElement,uno::UNO_QUERY); + ::rtl::OUString sTargetLocation = xImage->getImageURL(); if ( sTargetLocation.getLength() ) { sTargetLocation = GetRelativeReference(sTargetLocation); AddAttribute(XML_NAMESPACE_FORM, XML_IMAGE_DATA,sTargetLocation); } bExportData = sal_True; - if ( xProp->getScaleImage() ) + if ( xImage->getScaleImage() ) AddAttribute(XML_NAMESPACE_REPORT, XML_SCALE, XML_TRUE ); } else if ( xReportDefinition.is() ) @@ -1078,7 +1079,7 @@ } } else if ( eToken == XML_IMAGE ) - AddAttribute(XML_NAMESPACE_REPORT, XML_PRESERVE_IRI, XML_TRUE ); + AddAttribute(XML_NAMESPACE_REPORT, XML_PRESERVE_IRI, xImage->getPreserveIRI() ? XML_TRUE : XML_FALSE ); } if ( !bPageSet ) @@ -1160,6 +1161,8 @@ ::rtl::OUString ORptExport::convertFormula(const ::rtl::OUString& _sFormula) { ::rtl::OUString sFormula = _sFormula; + if ( _sFormula.equalsAsciiL("rpt:",4) ) + sFormula = ::rtl::OUString(); //sal_Int32 nLength = _sFormula.getLength(); //if ( nLength ) //{ @@ -1180,7 +1183,7 @@ // ----------------------------------------------------------------------------- bool ORptExport::exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const ::rtl::OUString& _sFormula) { - ::rtl::OUString sFieldData = convertFormula(_sFormula); + const ::rtl::OUString sFieldData = convertFormula(_sFormula); static const ::rtl::OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("PageNumber()")); static const ::rtl::OUString s_sPageCount(RTL_CONSTASCII_USTRINGPARAM("PageCount()")); sal_Int32 nPageNumberIndex = sFieldData.indexOf(s_sPageNumber); @@ -1458,6 +1461,9 @@ ::rtl::OUString sName = xProp->getCaption(); if ( sName.getLength() ) AddAttribute(XML_NAMESPACE_OFFICE, XML_CAPTION,sName); + sName = xProp->getName(); + if ( sName.getLength() ) + AddAttribute(XML_NAMESPACE_DRAW, XML_NAME,sName); } } // ----------------------------------------------------------------------------- File [changed]: xmlReport.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlReport.cxx?r1=1.3&r2=1.3.18.1 Delta lines: +6 -3 ------------------- --- xmlReport.cxx 2007-08-02 14:33:57+0000 1.3 +++ xmlReport.cxx 2007-09-20 10:13:01+0000 1.3.18.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlReport.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.18.1 $ * - * last change: $Author: hr $ $Date: 2007/08/02 14:33:57 $ + * last change: $Author: oj $ $Date: 2007/09/20 10:13:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -145,6 +145,9 @@ case XML_TOK_REPORT_MIMETYPE: m_xComponent->setMimeType(sValue); break; + case XML_TOK_REPORT_NAME: + m_xComponent->setName(sValue); + break; default: break; } File [changed]: xmlfilter.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlfilter.cxx?r1=1.4&r2=1.4.20.1 Delta lines: +4 -3 ------------------- --- xmlfilter.cxx 2007-08-03 09:58:48+0000 1.4 +++ xmlfilter.cxx 2007-09-20 10:13:01+0000 1.4.20.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlfilter.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.20.1 $ * - * last change: $Author: hr $ $Date: 2007/08/03 09:58:48 $ + * last change: $Author: oj $ $Date: 2007/09/20 10:13:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -729,6 +729,7 @@ { XML_NAMESPACE_REPORT, XML_ESCAPE_PROCESSING, XML_TOK_ESCAPE_PROCESSING }, { XML_NAMESPACE_REPORT, XML_FUNCTION, XML_TOK_REPORT_FUNCTION }, { XML_NAMESPACE_OFFICE, XML_MIMETYPE, XML_TOK_REPORT_MIMETYPE }, + { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_REPORT_NAME }, XML_TOKEN_MAP_END }; m_pReportElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
