diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-07-17 17:44:05 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-07-17 17:51:26 +0200 |
| commit | 78e8911d25ff33892fd3121b3f0a8df6a6439d72 (patch) | |
| tree | 524abf0a80e76e6b42495ed3bd72f89b7b0e2bd3 | |
| parent | warning C4701: potentially uninitialized local variable used (diff) | |
| download | core-78e8911d25ff33892fd3121b3f0a8df6a6439d72.tar.gz core-78e8911d25ff33892fd3121b3f0a8df6a6439d72.zip | |
SwWriteTable: warning C4389: '==': signed/unsigned mismatch
Change-Id: I58b2f74aef426e880ed7f2867e4cb0bbdff44328
| -rw-r--r-- | sw/source/filter/inc/wrtswtbl.hxx | 8 | ||||
| -rw-r--r-- | sw/source/filter/writer/wrtswtbl.cxx | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx index fbb62f5273cb..15f87bd3fef5 100644 --- a/sw/source/filter/inc/wrtswtbl.hxx +++ b/sw/source/filter/inc/wrtswtbl.hxx @@ -292,7 +292,7 @@ protected: void MergeBorders( const editeng::SvxBorderLine* pBorderLine, sal_Bool bTable ); - sal_uInt16 MergeBoxBorders( const SwTableBox *pBox, sal_uInt16 nRow, sal_uInt16 nCol, + sal_uInt16 MergeBoxBorders(const SwTableBox *pBox, size_t nRow, size_t nCol, sal_uInt16 nRowSpan, sal_uInt16 nColSpan, sal_uInt16 &rTopBorder, sal_uInt16 &rBottomBorder ); @@ -308,16 +308,16 @@ public: sal_uInt16 GetRelWidth( sal_uInt16 nCol, sal_uInt16 nColSpan ) const; sal_uInt16 GetPrcWidth( sal_uInt16 nCol, sal_uInt16 nColSpan ) const; - long GetAbsHeight( long nRawWidth, sal_uInt16 nRow, sal_uInt16 nRowSpan ) const; -protected: + long GetAbsHeight(long nRawWidth, size_t nRow, sal_uInt16 nRowSpan) const; +protected: long GetLineHeight( const SwTableLine *pLine ); long GetLineHeight( const SwTableBox *pBox ) const; const SvxBrushItem *GetLineBrush( const SwTableBox *pBox, SwWriteTableRow *pRow ); sal_uInt16 GetLeftSpace( sal_uInt16 nCol ) const; - sal_uInt16 GetRightSpace( sal_uInt16 nCol, sal_uInt16 nColSpan ) const; + sal_uInt16 GetRightSpace(size_t nCol, sal_uInt16 nColSpan) const; public: diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx index d52ff1138caa..ef8697c5f97e 100644 --- a/sw/source/filter/writer/wrtswtbl.cxx +++ b/sw/source/filter/writer/wrtswtbl.cxx @@ -241,7 +241,7 @@ void SwWriteTable::MergeBorders( const SvxBorderLine* pBorderLine, sal_uInt16 SwWriteTable::MergeBoxBorders( const SwTableBox *pBox, - sal_uInt16 nRow, sal_uInt16 nCol, + size_t const nRow, size_t const nCol, sal_uInt16 nRowSpan, sal_uInt16 nColSpan, sal_uInt16& rTopBorder, sal_uInt16 &rBottomBorder ) @@ -326,7 +326,8 @@ sal_uInt16 SwWriteTable::GetLeftSpace( sal_uInt16 nCol ) const return nSpace; } -sal_uInt16 SwWriteTable::GetRightSpace( sal_uInt16 nCol, sal_uInt16 nColSpan ) const +sal_uInt16 +SwWriteTable::GetRightSpace(size_t const nCol, sal_uInt16 nColSpan) const { sal_uInt16 nSpace = nCellPadding; @@ -377,7 +378,7 @@ sal_uInt16 SwWriteTable::GetPrcWidth( sal_uInt16 nCol, sal_uInt16 nColSpan ) con GetBaseWidth() ); } -long SwWriteTable::GetAbsHeight( long nRawHeight, sal_uInt16 nRow, +long SwWriteTable::GetAbsHeight(long nRawHeight, size_t const nRow, sal_uInt16 nRowSpan ) const { nRawHeight -= (2*nCellPadding + nCellSpacing); |