diff options
| author | Mark Wielaard <mark@klomp.org> | 2013-06-03 09:35:25 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-06-03 11:16:37 +0000 |
| commit | addc791623288fae7832c78e0c2923937251d1f7 (patch) | |
| tree | 8808f201f000c9348a2b4fd1f0076d272ec1fee0 /i18npool/qa | |
| parent | d47fb9474421e950b828a921565656babab9d9ba (diff) | |
Fix icu version checks.
commit 30c303 "Make charmap.cxx compile with icu >= 4.4." was incomplete
and had wrong version checks. After ICU 4.8 (4.8.1.1) the next version
of ICU was 49 (49.1) so U_ICU_VERSION_MAJOR_NUM contains two digets (49),
earlier that it was just one digit (4). The correct header to include to
do version checks is unicode/uversion.h. USCRIPT_MANDAEAN is the old
alias of USCRIPT_MANDAIC (same numeric value). U_JG_FARSI_YEH is only
available since ICU 4.4. Note that on older icu versions (4.2.1) the
200B (ZWSP) Zero Width Space breakiterator testcase fails (others
succeed).
Change-Id: If73c1402239a28546077437e9382f0bd38642bad
Reviewed-on: https://gerrit.libreoffice.org/4139
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'i18npool/qa')
| -rw-r--r-- | i18npool/qa/cppunit/test_breakiterator.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx index b3ec68fa969a..4ba6a79013a5 100644 --- a/i18npool/qa/cppunit/test_breakiterator.cxx +++ b/i18npool/qa/cppunit/test_breakiterator.cxx @@ -19,7 +19,7 @@ #include <com/sun/star/i18n/WordType.hpp> #include <unotest/bootstrapfixturebase.hxx> -#include <unicode/uvernum.h> +#include <unicode/uversion.h> #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> @@ -236,6 +236,8 @@ void TestBreakIterator::testWordBoundaries() } //See https://bugs.freedesktop.org/show_bug.cgi?id=49629 + //Note that the breakiterator test will fail on older icu versions + //(4.2.1) for the 200B (ZWSP) Zero Width Space testcase. sal_Unicode aBreakTests[] = { ' ', 1, 2, 3, 4, 5, 6, 7, 0x91, 0x92, 0x200B, 0xE8FF, 0xF8FF }; for (int mode = i18n::WordType::ANY_WORD; mode <= i18n::WordType::WORD_COUNT; ++mode) { |