svx/source/gallery2/galctrl.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c28c1be1715d63ec4cff940ef270fb13c0c6db9a
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Jan 22 22:31:08 2018 +0100
USHRT_MAX -> SAL_MAX_UINT16
...as BrowseBox::GetColumnId (into which _nColumnPos is passed) takes a
sal_uInt16 argument
Change-Id: I4b890bf0fcbc91f2f07b3614a2e07aabf3345f7e
Reviewed-on: https://gerrit.libreoffice.org/48363
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 4a9799c4a087..b8971286cb26 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -455,7 +455,7 @@ OUString GalleryListView::GetCellText(long _nRow,
sal_uInt16 /*nColumnId*/) cons
tools::Rectangle GalleryListView::GetFieldCharacterBounds(sal_Int32
_nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex)
{
- DBG_ASSERT(_nColumnPos >= 0 && _nColumnPos <= USHRT_MAX,
"GalleryListView::GetFieldCharacterBounds: _nColumnId overflow");
+ DBG_ASSERT(_nColumnPos >= 0 && _nColumnPos <= SAL_MAX_UINT16,
"GalleryListView::GetFieldCharacterBounds: _nColumnId overflow");
tools::Rectangle aRect;
if ( SeekRow(_nRow) )
{
@@ -472,7 +472,7 @@ tools::Rectangle
GalleryListView::GetFieldCharacterBounds(sal_Int32 _nRow,sal_In
sal_Int32 GalleryListView::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32
_nColumnPos,const Point& _rPoint)
{
- DBG_ASSERT(_nColumnPos >= 0 && _nColumnPos <= USHRT_MAX,
"GalleryListView::GetFieldIndexAtPoint: _nColumnId overflow");
+ DBG_ASSERT(_nColumnPos >= 0 && _nColumnPos <= SAL_MAX_UINT16,
"GalleryListView::GetFieldIndexAtPoint: _nColumnId overflow");
sal_Int32 nRet = -1;
if ( SeekRow(_nRow) )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
