summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2016-05-29 13:01:04 +0200
committerLionel Elie Mamane <lionel@mamane.lu>2016-05-29 15:58:44 +0000
commit634fd0016ef7396a782d28272852302841f37201 (patch)
tree35f697f4514f643ba278535e45233a13d02cb3d7
parent1c5e150ec81fca20af80c4372bbc96413a481340 (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>
-rw-r--r--include/svx/gridctrl.hxx4
-rw-r--r--svx/source/fmcomp/gridctrl.cxx4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 85c63469f5ee..d23b7d0c5578 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -498,9 +498,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 20830d55b552..8effd55325b8 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2822,7 +2822,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())
@@ -2830,7 +2830,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) ];