summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2013-04-01 18:13:16 +0200
committerJulien Nabet <serval2412@yahoo.fr>2013-04-01 18:13:16 +0200
commit182059964fb566c16348b6bec0869a19894bfdc7 (patch)
treea37dac4a56258009e9f72508a243efba3104f683
parent93ce5834a6651a2d3ccf6e56336b1ec48c7905f2 (diff)
Prefer prefix ++/-- operators for non-primitive types
Change-Id: Ie155215aea1d6f15e51bf5e64bab10eb2198d4de
-rw-r--r--drawinglayer/source/processor2d/vclhelperbufferdevice.cxx2
-rw-r--r--oox/source/drawingml/table/tableproperties.cxx14
2 files changed, 7 insertions, 9 deletions
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index 0832e4dce2e8..f87afc62ff2c 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
@@ -89,7 +89,7 @@ namespace
bool bOkay(false);
aBuffers::iterator aFound(maFreeBuffers.end());
- for(aBuffers::iterator a(maFreeBuffers.begin()); a != maFreeBuffers.end(); a++)
+ for(aBuffers::iterator a(maFreeBuffers.begin()); a != maFreeBuffers.end(); ++a)
{
OSL_ENSURE(*a, "Empty pointer in VDevBuffer (!)");
diff --git a/oox/source/drawingml/table/tableproperties.cxx b/oox/source/drawingml/table/tableproperties.cxx
index e9d7e5ee8c86..440a0a541232 100644
--- a/oox/source/drawingml/table/tableproperties.cxx
+++ b/oox/source/drawingml/table/tableproperties.cxx
@@ -139,12 +139,14 @@ void TableProperties::pushToPropSet( const ::oox::core::XmlFilterBase& rFilterBa
const TableStyle& rTableStyle( getUsedTableStyle( rFilterBase ) );
sal_Int32 nRow = 0;
- std::vector< TableRow >::iterator aTableRowIter( mvTableRows.begin() );
- while( aTableRowIter != mvTableRows.end() )
+ const std::vector< TableRow >::const_iterator aTableRowEnd( mvTableRows.end() );
+ for (std::vector< TableRow >::iterator aTableRowIter( mvTableRows.begin() );
+ aTableRowIter != aTableRowEnd ; ++aTableRowIter, ++nRow)
{
sal_Int32 nColumn = 0;
- std::vector< TableCell >::iterator aTableCellIter( aTableRowIter->getTableCells().begin() );
- while( aTableCellIter != aTableRowIter->getTableCells().end() )
+ const std::vector< TableCell >::const_iterator aTableCellEnd( aTableRowIter->getTableCells().end() );
+ for (std::vector< TableCell >::iterator aTableCellIter( aTableRowIter->getTableCells().begin() );
+ aTableCellIter != aTableCellEnd ; ++aTableCellIter, ++nColumn)
{
TableCell& rTableCell( *aTableCellIter );
if ( !rTableCell.getvMerge() && !rTableCell.gethMerge() )
@@ -157,11 +159,7 @@ void TableProperties::pushToPropSet( const ::oox::core::XmlFilterBase& rFilterBa
rTableCell.pushToXCell( rFilterBase, pMasterTextListStyle, xCellRange->getCellByPosition( nColumn, nRow ), *this, rTableStyle,
nColumn, aTableRowIter->getTableCells().size(), nRow, mvTableRows.size() );
}
- nColumn++;
- aTableCellIter++;
}
- nRow++;
- aTableRowIter++;
}
}