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 /filter | |
| 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 'filter')
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 32674f5ccf5e..ad52f219c4c3 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -6360,7 +6360,7 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet, boost::optional< sal_Int16 >& aTabItem.Insert( SvxTabStop( (sal_uInt16)0 ) ); if ( nDefaultTab ) { - nTab = ( nTextOfs2 > nLatestManTab ) ? nTextOfs2 : nLatestManTab; + nTab = std::max( nTextOfs2, nLatestManTab ); nTab /= nDefaultTab; nTab = nDefaultTab * ( 1 + nTab ); for ( i = 0; ( i < 20 ) && ( nTab < 0x1b00 ); i++ ) |