From 7d8e94444d989d0ac4a4055b207726708e9ec0da Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu, 11 Jan 2018 08:47:15 +0200
Subject: convert a<b?a:b to std::min(a,b)

with something like

    git grep -nP '(.*)\s*<\s*(.*)\s*\?\s*\g1\s*:\s*\g2' -- *.?xx

Change-Id: Id5078b35961847feb78a66204fdb7598ee63fd23
Note: we also convert a>b?b:a
Reviewed-on: https://gerrit.libreoffice.org/47736
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 sc/source/core/tool/scmatrix.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sc/source/core/tool/scmatrix.cxx')

diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 19d4b62394b6..d22fdd347e26 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -363,7 +363,7 @@ static size_t GetElementsMax( size_t nMemory )
     // With MAXROWCOUNT==1048576 and 128 columns => 128M elements, 1.5GB
     constexpr size_t nArbitraryLimit = size_t(MAXROWCOUNT) * 128;
     // With the constant 1GB from above that's the actual value.
-    return nElemMax < nArbitraryLimit ? nElemMax : nArbitraryLimit;
+    return std::min(nElemMax, nArbitraryLimit);
 }
 
 ScMatrixImpl::ScMatrixImpl(SCSIZE nC, SCSIZE nR) :
-- 
cgit v1.2.3