[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - sc/source

[Ashod Nakashian]

 sc/source/ui/view/gridwin4.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a6ab2c0f7354ddf3a1aa3e565e184bccfc21b839
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Fri Jun 17 20:15:38 2016 -0400

    Use explicit type in std::max
    
    Change-Id: I777d5387d9377f0f8032d68a9191a7fa110287c5
    Reviewed-on: https://gerrit.libreoffice.org/26477
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index cc6c733..ea1bc5c 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1077,8 +1077,8 @@ void ScGridWindow::PaintTile( VirtualDevice& rDevice,
 
     nTopLeftTileCol = std::min(nTopLeftTileCol, (sal_Int32)nEndCol);
     nTopLeftTileRow = std::min(nTopLeftTileRow, (sal_Int32)nEndRow);
-    nTopLeftTileCol = std::max(nTopLeftTileCol, 0);
-    nTopLeftTileRow = std::max(nTopLeftTileRow, 0);
+    nTopLeftTileCol = std::max<sal_Int32>(nTopLeftTileCol, 0);
+    nTopLeftTileRow = std::max<sal_Int32>(nTopLeftTileRow, 0);
     nBottomRightTileCol = std::min(nBottomRightTileCol, (sal_Int32)nEndCol);
     nBottomRightTileRow = std::min(nBottomRightTileRow, (sal_Int32)nEndRow);
     nTopLeftTileColOrigin = nTopLeftTileColOrigin * TWIPS_PER_PIXEL;