Tag: cws_src680_reportdesign03 User: oj Date: 2007-12-14 10:25:10+0000 Modified: dba/reportdesign/source/filter/xml/xmlExport.cxx dba/reportdesign/source/filter/xml/xmlFixedContent.cxx dba/reportdesign/source/filter/xml/xmlfilter.cxx
Log: RESYNC: (1.5-1.6); FILE MERGED File Changes: Directory: /dba/reportdesign/source/filter/xml/ =============================================== File [changed]: xmlExport.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlExport.cxx?r1=1.5.44.1&r2=1.5.44.2 Delta lines: +30 -13 --------------------- --- xmlExport.cxx 2007-11-29 14:49:45+0000 1.5.44.1 +++ xmlExport.cxx 2007-12-14 10:24:53+0000 1.5.44.2 @@ -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,14 @@ else if ( xElement->supportsService(SERVICE_IMAGECONTROL) ) { eToken = XML_IMAGE; - Reference< XImageControl > xProp(xElement,uno::UNO_QUERY); - ::rtl::OUString sTargetLocation = xProp->getImageURL(); + ::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() ) @@ -1036,7 +1036,7 @@ if ( bPageSet ) eToken = XML_FIXED_CONTENT; 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 ) @@ -1053,6 +1053,12 @@ else if ( eToken == XML_SUB_DOCUMENT ) { exportMasterDetailFields(xReportDefinition); + SvXMLElementExport aOfficeElement( *this, XML_NAMESPACE_OFFICE, XML_BODY,sal_True, sal_True ); + SvXMLElementExport aElem( *this, sal_True, + XML_NAMESPACE_OFFICE, XML_REPORT, + sal_True, sal_True ); + + exportReportAttributes(xReportDefinition); exportReport(xReportDefinition); } else if ( xSection.is() ) @@ -1118,6 +1124,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 ) //{ @@ -1138,7 +1146,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); @@ -1392,30 +1400,38 @@ void ORptExport::SetBodyAttributes() { Reference<XReportDefinition> xProp(getReportDefinition()); - if ( xProp.is() ) + exportReportAttributes(xProp); +} +// ----------------------------------------------------------------------------- +void ORptExport::exportReportAttributes(const Reference<XReportDefinition>& _xReport) +{ + if ( _xReport.is() ) { ::rtl::OUStringBuffer sValue; const SvXMLEnumMapEntry* aXML_CommnadTypeEnumMap = OXMLHelper::GetCommandTypeOptions(); - if ( SvXMLUnitConverter::convertEnum( sValue, static_cast<sal_uInt16>(xProp->getCommandType()),aXML_CommnadTypeEnumMap ) ) + if ( SvXMLUnitConverter::convertEnum( sValue, static_cast<sal_uInt16>(_xReport->getCommandType()),aXML_CommnadTypeEnumMap ) ) AddAttribute(XML_NAMESPACE_REPORT, XML_COMMAND_TYPE,sValue.makeStringAndClear()); - ::rtl::OUString sComamnd = xProp->getCommand(); + ::rtl::OUString sComamnd = _xReport->getCommand(); if ( sComamnd.getLength() ) AddAttribute(XML_NAMESPACE_REPORT, XML_COMMAND, sComamnd); - ::rtl::OUString sFilter( xProp->getFilter() ); + ::rtl::OUString sFilter( _xReport->getFilter() ); if ( sFilter.getLength() ) AddAttribute( XML_NAMESPACE_REPORT, XML_FILTER, sFilter ); - AddAttribute(XML_NAMESPACE_OFFICE, XML_MIMETYPE,xProp->getMimeType()); + AddAttribute(XML_NAMESPACE_OFFICE, XML_MIMETYPE,_xReport->getMimeType()); - sal_Bool bEscapeProcessing( xProp->getEscapeProcessing() ); + sal_Bool bEscapeProcessing( _xReport->getEscapeProcessing() ); if ( !bEscapeProcessing ) AddAttribute( XML_NAMESPACE_REPORT, XML_ESCAPE_PROCESSING, ::xmloff::token::GetXMLToken( XML_FALSE ) ); - ::rtl::OUString sName = xProp->getCaption(); + ::rtl::OUString sName = _xReport->getCaption(); if ( sName.getLength() ) AddAttribute(XML_NAMESPACE_OFFICE, XML_CAPTION,sName); + sName = _xReport->getName(); + if ( sName.getLength() ) + AddAttribute(XML_NAMESPACE_DRAW, XML_NAME,sName); } } // ----------------------------------------------------------------------------- @@ -1667,6 +1683,7 @@ void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddParagraph) { UniReference< XMLShapeExport > xShapeExport = GetShapeExport(); + xShapeExport->seekShapes(_xSection.get()); const sal_Int32 nCount = _xSection->getCount(); awt::Point aRefPoint; ::std::auto_ptr<SvXMLElementExport> pParagraphContent; Directory: /dba/reportdesign/source/filter/xml/ =============================================== File [changed]: xmlFixedContent.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlFixedContent.cxx?r1=1.3.20.1&r2=1.3.20.2 Delta lines: +1 -1 ------------------- --- xmlFixedContent.cxx 2007-11-29 14:49:45+0000 1.3.20.1 +++ xmlFixedContent.cxx 2007-12-14 10:24:56+0000 1.3.20.2 @@ -190,7 +190,7 @@ Reference<XMultiServiceFactory> xFactor = m_rImport.getServiceFactory(); m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); - sal_uInt16 nToken = rTokenMap.Get( nPrefix, rLocalName ); + const sal_uInt16 nToken = rTokenMap.Get( nPrefix, rLocalName ); switch( nToken ) { case XML_TOK_P: 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.4.44.1&r2=1.4.44.2 Delta lines: +3 -3 ------------------- --- xmlfilter.cxx 2007-12-06 07:37:00+0000 1.4.44.1 +++ xmlfilter.cxx 2007-12-14 10:24:59+0000 1.4.44.2 @@ -331,8 +331,7 @@ xDocStream = xStorage->openStreamElement( sStreamName, embed::ElementModes::READ ); uno::Reference< beans::XPropertySet > xProps( xDocStream, uno::UNO_QUERY_THROW ); - uno::Any aAny = xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Encrypted") ) ); - aAny >>= bEncrypted; + xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Encrypted") ) ) >>= bEncrypted; } catch( packages::WrongPasswordException& ) { @@ -729,6 +728,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 )); @@ -909,6 +909,7 @@ { XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL , XML_TOK_COV_CELL }, { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_SPANNED , XML_TOK_NUMBER_COLUMNS_SPANNED }, { XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_SPANNED , XML_TOK_NUMBER_ROWS_SPANNED }, + { XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION, XML_TOK_CONDITIONAL_PRINT_EXPRESSION}, XML_TOKEN_MAP_END }; m_pColumnTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -924,7 +925,6 @@ { { XML_NAMESPACE_TABLE, XML_TABLE , XML_TOK_TABLE }, { XML_NAMESPACE_TABLE, XML_NAME , XML_TOK_SECTION_NAME }, - { XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION, XML_TOK_CONDITIONAL_PRINT_EXPRESSION}, { XML_NAMESPACE_REPORT, XML_VISIBLE , XML_TOK_VISIBLE }, { XML_NAMESPACE_REPORT, XML_FORCE_NEW_PAGE , XML_TOK_FORCE_NEW_PAGE }, { XML_NAMESPACE_REPORT, XML_FORCE_NEW_COLUMN , XML_TOK_FORCE_NEW_COLUMN }, --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
