Tag: cws_src680_reportdesign02 User: oj Date: 2007-12-20 13:15:29+0000 Modified: dba/reportdesign/source/filter/xml/xmlExport.cxx
Log: merge conflict resolved 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.36.3&r2=1.5.36.4 Delta lines: +10 -10 --------------------- --- xmlExport.cxx 2007-12-20 08:42:12+0000 1.5.36.3 +++ xmlExport.cxx 2007-12-20 13:15:26+0000 1.5.36.4 @@ -4,9 +4,9 @@ * * $RCSfile: xmlExport.cxx,v $ * - * $Revision: 1.5.36.3 $ + * $Revision: 1.5.36.4 $ * - * last change: $Author: oj $ $Date: 2007/12/20 08:42:12 $ + * last change: $Author: oj $ $Date: 2007/12/20 13:15:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1621,14 +1621,6 @@ OSL_PRECOND(_xReportElement.is(),"Element is null!"); // start <text:p> SvXMLElementExport aParagraphContent(*this,XML_NAMESPACE_TEXT, XML_P, sal_False, sal_False); - Reference< XFixedText > xFT(_xReportElement,UNO_QUERY); - if ( xFT.is() ) - { - ::rtl::OUString sExpr = xFT->getLabel(); - sal_Bool bPrevCharIsSpace = sal_False; - GetTextParagraphExport()->exportText(sExpr,bPrevCharIsSpace); - } -} if ( Reference<XFormattedField>(_xReportElement,uno::UNO_QUERY).is() ) { ::rtl::OUString sFieldData = _xReportElement->getDataField(); @@ -1673,6 +1665,14 @@ while ( nIndex >= 0 ); } } + Reference< XFixedText > xFT(_xReportElement,UNO_QUERY); + if ( xFT.is() ) + { + ::rtl::OUString sExpr = xFT->getLabel(); + sal_Bool bPrevCharIsSpace = sal_False; + GetTextParagraphExport()->exportText(sExpr,bPrevCharIsSpace); + } +} // ----------------------------------------------------------------------------- XMLShapeExport* ORptExport::CreateShapeExport() { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
