diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-08 17:01:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-11 07:35:43 +0100 |
| commit | f14b9d30293f180500fc56d81e5390021758e7c1 (patch) | |
| tree | a6cd0b853169203cfa0953230e6774e7b1dd81b4 /sw/source/filter/html/htmlcss1.cxx | |
| parent | d11120b95ee27cb4b05db466ed07f7a996dda125 (diff) | |
convert (a>b?a:b) to std::max(a,b)
with something like:
git grep -nP '(.*)\s*>\s*(.*)\s*\?\s*\g1\s*:\s*\g2'
Change-Id: I60b9a3a2a09162bc0de4c13fdde2c209696e5413
Reviewed-on: https://gerrit.libreoffice.org/47602
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/filter/html/htmlcss1.cxx')
| -rw-r--r-- | sw/source/filter/html/htmlcss1.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index 14f7061c6233..e66fd1408d09 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -2048,7 +2048,7 @@ void SwHTMLParser::SetVarSize( SvxCSS1PropertyInfo const &rPropInfo, nWidth = MINFLY; break; case SVX_CSS1_LTYPE_TWIP: - nWidth = rPropInfo.m_nWidth > MINFLY ? rPropInfo.m_nWidth : MINFLY; + nWidth = std::max<long>(rPropInfo.m_nWidth, MINFLY); nPrcWidth = 0; break; default: @@ -2062,7 +2062,7 @@ void SwHTMLParser::SetVarSize( SvxCSS1PropertyInfo const &rPropInfo, case SVX_CSS1_LTYPE_TWIP: // Netscape and MS-IE interpreting the height incorrectly as minimum height, // therefore we are doing the same. - nHeight = rPropInfo.m_nHeight > MINFLY ? rPropInfo.m_nHeight : MINFLY; + nHeight = std::max<long>(rPropInfo.m_nHeight, MINFLY); break; default: ; |