include/svx/gridctrl.hxx | 4 ++--
svx/source/fmcomp/gridctrl.cxx | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 1b2d1b604e0c95a5c3afcf7b4dcc8ed7cc47cc39
Author: Julien Nabet <serval2...@yahoo.fr>
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 <lio...@mamane.lu>
Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu>
(cherry picked from commit 634fd0016ef7396a782d28272852302841f37201)
Reviewed-on: https://gerrit.libreoffice.org/25620
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 85c6346..d23b7d0 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 20830d5..8effd55 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) ];
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
