diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2010-12-29 09:49:33 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2010-12-29 10:52:55 +0100 |
commit | d31993e9c08c12c8d6bc27557feb17405ec580b4 (patch) | |
tree | 0976911ef5a773561602093cc86a674d396025a3 /svx/source/table | |
parent | c8913235844104085a8b7c57058ba14825a88446 (diff) |
Some cppcheck cleaning
Diffstat (limited to 'svx/source/table')
-rw-r--r-- | svx/source/table/accessibletableshape.cxx | 2 | ||||
-rw-r--r-- | svx/source/table/tabledesign.cxx | 2 | ||||
-rw-r--r-- | svx/source/table/tablelayouter.cxx | 7 | ||||
-rw-r--r-- | svx/source/table/tablelayouter.hxx | 5 |
4 files changed, 6 insertions, 10 deletions
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 2af13fcd44a2..94b6030e497b 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -229,7 +229,7 @@ void SAL_CALL AccessibleTableShapeImpl::modified( const EventObject& /*aEvent*/ // all accessible cell instances still left in aTempChildMap must be disposed // as they are no longer part of the table - for( AccessibleCellMap::iterator iter( aTempChildMap.begin() ); iter != aTempChildMap.end(); iter++ ) + for( AccessibleCellMap::iterator iter( aTempChildMap.begin() ); iter != aTempChildMap.end(); ++iter ) { (*iter).second->dispose(); } diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx index f52b7ae7b1a6..934f59f811ee 100644 --- a/svx/source/table/tabledesign.cxx +++ b/svx/source/table/tabledesign.cxx @@ -717,7 +717,7 @@ void SAL_CALL TableDesignFamily::dispose( ) throw (RuntimeException) TableDesignStyleVector aDesigns; aDesigns.swap( maDesigns ); - for( TableDesignStyleVector::iterator iter( aDesigns.begin() ); iter != aDesigns.end(); iter++ ) + for( TableDesignStyleVector::iterator iter( aDesigns.begin() ); iter != aDesigns.end(); ++iter ) { Reference< XComponent > xComp( (*iter), UNO_QUERY ); if( xComp.is() ) diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index b849a88cde7e..8f892e80605c 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -156,8 +156,7 @@ bool TableLayouter::getCellArea( const CellPos& rPos, basegfx::B2IRectangle& rAr } // ----------------------------------------------------------------------------- - -sal_Int32 TableLayouter::getRowHeight( sal_Int32 nRow ) +sal_Int32 TableLayouter::getRowHeight( sal_Int32 nRow ) const { if( isValidRow(nRow) ) return maRows[nRow].mnSize; @@ -180,8 +179,7 @@ void TableLayouter::setRowHeight( sal_Int32 nRow, sal_Int32 nHeight ) } // ----------------------------------------------------------------------------- - -sal_Int32 TableLayouter::getColumnWidth( sal_Int32 nColumn ) +sal_Int32 TableLayouter::getColumnWidth( sal_Int32 nColumn ) const { if( isValidColumn(nColumn) ) return maColumns[nColumn].mnSize; @@ -1204,7 +1202,6 @@ void TableLayouter::DistributeRows( ::Rectangle& rArea, sal_Int32 nFirstRow, sal } // ----------------------------------------------------------------------------- - void TableLayouter::SetWritingMode( com::sun::star::text::WritingMode eWritingMode ) { meWritingMode = eWritingMode; diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx index 5d38ad96e1d7..d191d4b2dff8 100644 --- a/svx/source/table/tablelayouter.hxx +++ b/svx/source/table/tablelayouter.hxx @@ -95,13 +95,12 @@ public: ::sal_Int32 getRowCount() const { return static_cast< ::sal_Int32 >( maRows.size() ); } ::sal_Int32 getColumnCount() const { return static_cast< ::sal_Int32 >( maColumns.size() ); } - - sal_Int32 getRowHeight( sal_Int32 nRow ); + sal_Int32 getRowHeight( sal_Int32 nRow ) const; // sets the layout height of the given row hard, LayoutTable must be called directly after calling this method! */ void setRowHeight( sal_Int32 nRow, sal_Int32 nHeight ); - sal_Int32 getColumnWidth( sal_Int32 nColumn ); + sal_Int32 getColumnWidth( sal_Int32 nColumn ) const; // sets the layout width of the given column hard, LayoutTable must be called directly after calling this method! */ void setColumnWidth( sal_Int32 nColumn, sal_Int32 nWidth ); |