diff options
| author | Eike Rathke <erack@redhat.com> | 2017-11-17 02:24:52 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-11-17 01:25:24 +0100 |
| commit | 0f73433b13ba9e3f38193ddd86f4b9b767a36bb2 (patch) | |
| tree | fc4ba8ff6f4bec273d50a4c51865b7420504f6e3 /external/icu/icu4c-khmerbreakengine.patch.1 | |
| parent | eb8bd7f21103ed2349b44c954db977709de2e4ec (diff) | |
Revert "Upgrade to ICU 60.1"
This reverts commit f643e1f687e27e7f46c53d7298772d4dddb3e660.
Failing in firebird, back to the drawing board..
Change-Id: I087d2fa6e81cf713458b1c9645edc7c1facf148c
Reviewed-on: https://gerrit.libreoffice.org/44843
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'external/icu/icu4c-khmerbreakengine.patch.1')
| -rw-r--r-- | external/icu/icu4c-khmerbreakengine.patch.1 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/external/icu/icu4c-khmerbreakengine.patch.1 b/external/icu/icu4c-khmerbreakengine.patch.1 index 6b45b3743611..74f60f866257 100644 --- a/external/icu/icu4c-khmerbreakengine.patch.1 +++ b/external/icu/icu4c-khmerbreakengine.patch.1 @@ -310,7 +310,7 @@ diff -ur icu.org/source/common/dictbe.cpp icu/source/common/dictbe.cpp @@ -886,180 +1035,204 @@ int32_t rangeStart, int32_t rangeEnd, - UVector32 &foundBreaks ) const { + UStack &foundBreaks ) const { - if ((rangeEnd - rangeStart) < KHMER_MIN_WORD_SPAN) { - return 0; // Not enough characters for two words - } @@ -760,7 +760,7 @@ diff -ur icu.org/source/common/dictbe.h icu/source/common/dictbe.h * @param text A UText representing the text. The iterator is left at - * the end of the run of characters which the engine is capable of handling + * the end of the run of characters which the engine is capable of handling - * that starts from the first character in the range. + * that starts from the first (or last) character in the range. * @param startPos The start of the run within the supplied text. * @param endPos The end of the run within the supplied text. @@ -245,118 +306,120 @@ @@ -819,7 +819,7 @@ diff -ur icu.org/source/common/dictbe.h icu/source/common/dictbe.h - virtual int32_t divideUpDictionaryRange( UText *text, - int32_t rangeStart, - int32_t rangeEnd, -- UVector32 &foundBreaks ) const; +- UStack &foundBreaks ) const; - -}; - @@ -875,7 +875,7 @@ diff -ur icu.org/source/common/dictbe.h icu/source/common/dictbe.h - virtual int32_t divideUpDictionaryRange( UText *text, - int32_t rangeStart, - int32_t rangeEnd, -- UVector32 &foundBreaks ) const; +- UStack &foundBreaks ) const; - -}; - @@ -931,7 +931,7 @@ diff -ur icu.org/source/common/dictbe.h icu/source/common/dictbe.h + virtual int32_t divideUpDictionaryRange( UText *text, + int32_t rangeStart, + int32_t rangeEnd, -+ UVector32 &foundBreaks ) const; ++ UStack &foundBreaks ) const; + +}; + @@ -989,7 +989,7 @@ diff -ur icu.org/source/common/dictbe.h icu/source/common/dictbe.h + virtual int32_t divideUpDictionaryRange( UText *text, + int32_t rangeStart, + int32_t rangeEnd, -+ UVector32 &foundBreaks ) const; ++ UStack &foundBreaks ) const; + +}; + |