diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2016-05-29 13:01:04 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-05-30 12:17:39 +0000 |
| commit | 3bfbbe60561af80a4796e32ee23fc7069eb8e4e2 (patch) | |
| tree | 4b6964559d96835ce258f3612a48ad2b766579e0 | |
| parent | c9122b4ae545efc9706c5802c4ab68f1ba7518df (diff) | |
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 <lionel@mamane.lu>
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
(cherry picked from commit 634fd0016ef7396a782d28272852302841f37201)
Reviewed-on: https://gerrit.libreoffice.org/25622
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | include/svx/gridctrl.hxx | 4 | ||||
| -rw-r--r-- | svx/source/fmcomp/gridctrl.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 5046f638e7d8..8ab2b8a6d193 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 5348090cbb11..d677cd3b1136 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) ]; |