Tag: cws_src680_rpt23fix02 User: oj Date: 2007-07-24 08:34:26+0000 Modified: dba/reportdesign/source/filter/xml/xmlTable.cxx
Log: #i79942# handle shapes correctly File Changes: Directory: /dba/reportdesign/source/filter/xml/ =============================================== File [changed]: xmlTable.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlTable.cxx?r1=1.2.4.1&r2=1.2.4.2 Delta lines: +9 -9 ------------------- --- xmlTable.cxx 2007-07-24 08:32:44+0000 1.2.4.1 +++ xmlTable.cxx 2007-07-24 08:34:23+0000 1.2.4.2 @@ -4,9 +4,9 @@ * * $RCSfile: xmlTable.cxx,v $ * - * $Revision: 1.2.4.1 $ + * $Revision: 1.2.4.2 $ * - * last change: $Author: oj $ $Date: 2007/07/24 08:32:44 $ + * last change: $Author: oj $ $Date: 2007/07/24 08:34:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -253,11 +253,11 @@ TCell& rCell = *aColIter; if ( !rCell.xElements.empty()) { - ::std::vector< uno::Reference< report::XReportComponent> >::iterator aIter = rCell.xElements.begin(); - const ::std::vector< uno::Reference< report::XReportComponent> >::iterator aEnd = rCell.xElements.end(); - for (;aIter != aEnd ; ++aIter) + ::std::vector< uno::Reference< report::XReportComponent> >::iterator aCellIter = rCell.xElements.begin(); + const ::std::vector< uno::Reference< report::XReportComponent> >::iterator aCellEnd = rCell.xElements.end(); + for (;aCellIter != aCellEnd ; ++aCellIter) { - uno::Reference<report::XShape> xShape(*aIter,uno::UNO_QUERY); + uno::Reference<report::XShape> xShape(*aCellIter,uno::UNO_QUERY); if ( xShape.is() ) { xShape->setPositionX(xShape->getPositionX() + nLeftMargin); @@ -287,7 +287,7 @@ --nRowSpan; } } - Reference<XFixedLine> xFixedLine(*aIter,uno::UNO_QUERY); + Reference<XFixedLine> xFixedLine(*aCellIter,uno::UNO_QUERY); if ( xFixedLine.is() && xFixedLine->getOrientation() == 1 ) // vertical { OSL_ENSURE(static_cast<sal_uInt32>(j+1) < m_aWidth.size(),"Illegal pos of col iter. There should be an empty cell for the next line part."); @@ -296,8 +296,8 @@ } try { - (*aIter)->setSize(awt::Size(nWidth,nHeight)); - (*aIter)->setPosition(awt::Point(nPosX,nPosY)); + (*aCellIter)->setSize(awt::Size(nWidth,nHeight)); + (*aCellIter)->setPosition(awt::Point(nPosX,nPosY)); } catch(beans::PropertyVetoException) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
