Tag: cws_src680_reportdesign03 User: oj Date: 2008-04-16 11:15:14+0000 Modified: dba/reportdesign/source/filter/xml/xmlExport.cxx
Log: merge problem 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.3&r2=1.5.44.4 Delta lines: +2 -5 ------------------- --- xmlExport.cxx 2008-04-16 07:09:03+0000 1.5.44.3 +++ xmlExport.cxx 2008-04-16 11:15:11+0000 1.5.44.4 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xmlExport.cxx,v $ - * $Revision: 1.5.44.3 $ + * $Revision: 1.5.44.4 $ * * This file is part of OpenOffice.org. * @@ -1635,9 +1635,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]
