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 /i18npool/source/transliteration/transliteration_Ignore.cxx | |
| 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 'i18npool/source/transliteration/transliteration_Ignore.cxx')
| -rw-r--r-- | i18npool/source/transliteration/transliteration_Ignore.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/i18npool/source/transliteration/transliteration_Ignore.cxx b/i18npool/source/transliteration/transliteration_Ignore.cxx index 503bf7d1858e..3a256fd34ae0 100644 --- a/i18npool/source/transliteration/transliteration_Ignore.cxx +++ b/i18npool/source/transliteration/transliteration_Ignore.cxx @@ -24,8 +24,6 @@ using namespace com::sun::star::uno; namespace i18npool { -inline sal_Int32 Min( sal_Int32 a, sal_Int32 b ) { return a > b ? b : a; } - sal_Bool SAL_CALL transliteration_Ignore::equals(const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) @@ -39,7 +37,7 @@ transliteration_Ignore::equals(const OUString& str1, sal_Int32 pos1, sal_Int32 n const sal_Unicode * p1 = s1.getStr(); const sal_Unicode * p2 = s2.getStr(); - sal_Int32 length = Min(s1.getLength(), s2.getLength()); + sal_Int32 length = std::min(s1.getLength(), s2.getLength()); sal_Int32 nmatch; for ( nmatch = 0; nmatch < length; nmatch++) |