include/svx/gridctrl.hxx | 4 ++-- svx/source/fmcomp/gridctrl.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 3bfbbe60561af80a4796e32ee23fc7069eb8e4e2 Author: Julien Nabet <[email protected]> Date: Sun May 29 13:01:04 2016 +0200 tdf#100115: _nColId is sal_uInt16 like the other methods, so fix it in canCopyCellText + copyCellText Change-Id: I3395f8823602f0a1791908945e3dec5034d3d612 Reviewed-on: https://gerrit.libreoffice.org/25605 Tested-by: Lionel Elie Mamane <[email protected]> Reviewed-by: Lionel Elie Mamane <[email protected]> (cherry picked from commit 634fd0016ef7396a782d28272852302841f37201) Reviewed-on: https://gerrit.libreoffice.org/25622 Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 5046f63..8ab2b8a 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -499,9 +499,9 @@ public: getContext() const { return m_xContext; } /// returns <TRUE/> if the text of the given cell can be copied into the clipboard - bool canCopyCellText(sal_Int32 _nRow, sal_Int16 _nColId); + bool canCopyCellText(sal_Int32 _nRow, sal_uInt16 _nColId); /// copies the text of the given cell into the clipboard - void copyCellText(sal_Int32 _nRow, sal_Int16 _nColId); + void copyCellText(sal_Int32 _nRow, sal_uInt16 _nColId); // select in listener handling void setGridListener( FmGridListener* _pListener ) { m_pGridListener = _pListener; } diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 5348090..d677cd3 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -2824,7 +2824,7 @@ void DbGridControl::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel ) } } -bool DbGridControl::canCopyCellText(sal_Int32 _nRow, sal_Int16 _nColId) +bool DbGridControl::canCopyCellText(sal_Int32 _nRow, sal_uInt16 _nColId) { return (_nRow >= 0) && (_nRow < GetRowCount()) @@ -2832,7 +2832,7 @@ bool DbGridControl::canCopyCellText(sal_Int32 _nRow, sal_Int16 _nColId) && (_nColId <= ColCount()); } -void DbGridControl::copyCellText(sal_Int32 _nRow, sal_Int16 _nColId) +void DbGridControl::copyCellText(sal_Int32 _nRow, sal_uInt16 _nColId) { DBG_ASSERT(canCopyCellText(_nRow, _nColId), "DbGridControl::copyCellText: invalid call!"); DbGridColumn* pColumn = m_aColumns[ GetModelColumnPos(_nColId) ]; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
