Skip to content

C
core
Kaydet (Commit) 78e8911d authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

SwWriteTable: warning C4389: '==': signed/unsigned mismatch 

Change-Id: I58b2f74aef426e880ed7f2867e4cb0bbdff44328
üst b8aa2fa9
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 7 deletions
sw/source/filter/inc/wrtswtbl.hxx
Dosyayı görüntüle @ 78e8911d
......@@ -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:
......
sw/source/filter/writer/wrtswtbl.cxx
Dosyayı görüntüle @ 78e8911d
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment