diff options
| author | Tomáš Chvátal <tchvatal@suse.com> | 2019-03-15 16:43:31 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2019-03-22 20:58:16 +0100 |
| commit | 3aaee1170807ba5b8a301291800a89e96c012832 (patch) | |
| tree | 702879a552758b94ac459f7dd911485d661b6282 /sc | |
| parent | 743b0a92acc3d1850f4890efaa706098ebf9f558 (diff) | |
Use RegexMatcher.find(pos, status) call on old ICU
The RegexMatcher.find(status) is new since icu 55 and this works even
on the old releases thus revert there to the available albeit slower
call.
Change-Id: I964c10efd15515b04ac9037cda3b5b309910baf5
Reviewed-on: https://gerrit.libreoffice.org/69311
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/tool/interpr1.cxx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 75fd8f82b874..0281ab3f4cbf 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -9408,7 +9408,12 @@ void ScInterpreter::ScRegex() { // Find n-th occurrence. sal_Int32 nCount = 0; - while (aRegexMatcher.find( status) && U_SUCCESS(status) && ++nCount < nOccurrence) +#if (U_ICU_VERSION_MAJOR_NUM < 55) + int32_t nStartPos = 0; + while (aRegexMatcher.find(nStartPos, status) && U_SUCCESS(status) && ++nCount < nOccurrence) +#else + while (aRegexMatcher.find(status) && U_SUCCESS(status) && ++nCount < nOccurrence) +#endif ; if (U_FAILURE(status)) { @@ -9448,7 +9453,12 @@ void ScInterpreter::ScRegex() { // Replace n-th occurrence of match with replacement. sal_Int32 nCount = 0; - while (aRegexMatcher.find( status) && U_SUCCESS(status)) +#if (U_ICU_VERSION_MAJOR_NUM < 55) + int32_t nStartPos = 0; + while (aRegexMatcher.find(nStartPos, status) && U_SUCCESS(status)) +#else + while (aRegexMatcher.find(status) && U_SUCCESS(status)) +#endif { // XXX NOTE: After several RegexMatcher::find() the // RegexMatcher::appendReplacement() still starts at the |