diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-11 08:47:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-15 07:26:17 +0100 |
| commit | 7d8e94444d989d0ac4a4055b207726708e9ec0da (patch) | |
| tree | ce3e4a09ed7932496c4d901360ff23787c8f6e24 /formula | |
| parent | 80fb8d406ced47e6a2089f0c8ba5c103d2fec91f (diff) | |
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>
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/ui/dlg/parawin.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index 10493bd9fd33..2a7d04cda253 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -129,7 +129,7 @@ void ParaWin::UpdateArgDesc( sal_uInt16 nArg ) else if ( nArgs < PAIRED_VAR_ARGS ) { sal_uInt16 nFix = nArgs - VAR_ARGS; - sal_uInt16 nPos = ( nArg < nFix ? nArg : nFix ); + sal_uInt16 nPos = std::min( nArg, nFix ); sal_uInt16 nRealArg = (nPos < aVisibleArgMapping.size() ? aVisibleArgMapping[nPos] : aVisibleArgMapping.back()); aArgDesc = pFuncDesc->getParameterDescription(nRealArg); @@ -182,7 +182,7 @@ void ParaWin::UpdateArgInput( sal_uInt16 nOffset, sal_uInt16 i ) else if ( nArgs < PAIRED_VAR_ARGS) { sal_uInt16 nFix = nArgs - VAR_ARGS; - sal_uInt16 nPos = ( nArg < nFix ? nArg : nFix ); + sal_uInt16 nPos = std::min( nArg, nFix ); sal_uInt16 nRealArg = (nPos < aVisibleArgMapping.size() ? aVisibleArgMapping[nPos] : aVisibleArgMapping.back()); SetArgNameFont( i, |