Tag: cws_src680_rptchart01 User: oj Date: 2008-02-19 16:59:31+0000 Modified: dba/reportdesign/source/filter/xml/xmlExport.cxx
Log: merge conflict 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.6.20.5&r2=1.6.20.6 Delta lines: +3 -6 ------------------- --- xmlExport.cxx 2008-02-19 09:22:34+0000 1.6.20.5 +++ xmlExport.cxx 2008-02-19 16:59:28+0000 1.6.20.6 @@ -4,9 +4,9 @@ * * $RCSfile: xmlExport.cxx,v $ * - * $Revision: 1.6.20.5 $ + * $Revision: 1.6.20.6 $ * - * last change: $Author: oj $ $Date: 2008/02/19 09:22:34 $ + * last change: $Author: oj $ $Date: 2008/02/19 16:59:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1694,9 +1694,6 @@ pParagraphContent.reset(new SvXMLElementExport(*this,XML_NAMESPACE_TEXT, XML_P, sal_True, sal_False)); awt::Point aRefPoint; - ::std::auto_ptr<SvXMLElementExport> pParagraphContent; - if ( _bAddParagraph ) - pParagraphContent.reset(new SvXMLElementExport(*this,XML_NAMESPACE_TEXT, XML_P, sal_True, sal_False)); aRefPoint.X = rptui::getStyleProperty<sal_Int32>(_xSection->getReportDefinition(),PROPERTY_LEFTMARGIN); for (sal_Int32 i = 0; i < nCount; ++i) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
