Tag: cws_src680_rpt23fix02 User: oj Date: 2007-07-30 12:57:17+0000 Modified: dba/reportdesign/source/filter/xml/xmlExport.cxx dba/reportdesign/source/filter/xml/xmlExport.hxx
Log: #77152# add text:p only when not already inserted 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.2.4.1&r2=1.2.4.2 Delta lines: +6 -3 ------------------- --- xmlExport.cxx 2007-07-24 12:48:04+0000 1.2.4.1 +++ xmlExport.cxx 2007-07-30 12:57:14+0000 1.2.4.2 @@ -986,7 +986,7 @@ if ( !bShapeHandled ) { bShapeHandled = true; - exportShapes(_xSection); + exportShapes(_xSection,false); } uno::Reference< XShape > xShape(xElement,uno::UNO_QUERY); uno::Reference< XFixedLine > xFixedLine(xElement,uno::UNO_QUERY); @@ -1662,7 +1662,7 @@ return pShapeExport; } // ----------------------------------------------------------------------------- -void ORptExport::exportShapes(const Reference< XSection>& _xSection) +void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddParagraph) { UniReference< XMLShapeExport > xShapeExport = GetShapeExport(); const sal_Int32 nCount = _xSection->getCount(); @@ -1673,7 +1673,10 @@ uno::Reference< XShape > xShape(_xSection->getByIndex(i),uno::UNO_QUERY); if ( xShape.is() ) { + if ( _bAddParagraph ) + { SvXMLElementExport aParagraphContent(*this,XML_NAMESPACE_TEXT, XML_P, sal_False, sal_False); + } AddAttribute( XML_NAMESPACE_TEXT, XML_ANCHOR_TYPE, XML_PARAGRAPH ); xShapeExport->exportShape(xShape.get(),SEF_DEFAULT,&aRefPoint); } File [changed]: xmlExport.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlExport.hxx?r1=1.2.4.1&r2=1.2.4.2 Delta lines: +1 -1 ------------------- --- xmlExport.hxx 2007-07-24 12:48:04+0000 1.2.4.1 +++ xmlExport.hxx 2007-07-30 12:57:14+0000 1.2.4.2 @@ -216,7 +216,7 @@ void exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,const ::rtl::OUString& _sName); void exportSection(const Reference<XSection>& _xProp,bool bHeader = false); void exportContainer(const Reference< XSection>& _xSection); - void exportShapes(const Reference< XSection>& _xSection); + void exportShapes(const Reference< XSection>& _xSection,bool _bAddParagraph = true); void exportTableColumns(const Reference< XSection>& _xSection); void exportSectionAutoStyle(const Reference<XSection>& _xProp); void exportReportElement(const Reference<XReportControlModel>& _xReportElement); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
