diff options
| author | Andras Timar <andras.timar@collabora.com> | 2017-04-24 10:55:47 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-04-24 11:01:41 +0200 |
| commit | b799279088353b38117171ea212c73af6ccae648 (patch) | |
| tree | 3c68275c6b5a2dc9224a8832cb3da8ad9758a1ec /i18npool | |
| parent | aa89161fc713a365bbec2936331f4f342d6eb58d (diff) | |
Revert back to ICU 54, because MSP cannot be generated on Windows
Change-Id: Ie0c857c9c8fd7091e115245c75d7490d46033426
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/qa/cppunit/test_breakiterator.cxx | 20 | ||||
| -rw-r--r-- | i18npool/source/breakiterator/breakiterator_unicode.cxx | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx index 567fec5d8580..be4dd6d13935 100644 --- a/i18npool/qa/cppunit/test_breakiterator.cxx +++ b/i18npool/qa/cppunit/test_breakiterator.cxx @@ -39,28 +39,29 @@ public: void testWeak(); void testAsian(); void testThai(); -#if (U_ICU_VERSION_MAJOR_NUM > 51) void testLao(); #ifdef TODO void testNorthernThai(); - void testKhmer(); -#endif #endif + void testKhmer(); void testJapanese(); void testChinese(); CPPUNIT_TEST_SUITE(TestBreakIterator); CPPUNIT_TEST(testLineBreaking); - CPPUNIT_TEST(testWordBoundaries); CPPUNIT_TEST(testGraphemeIteration); CPPUNIT_TEST(testWeak); CPPUNIT_TEST(testAsian); CPPUNIT_TEST(testThai); -#if (U_ICU_VERSION_MAJOR_NUM > 51) - CPPUNIT_TEST(testLao); #ifdef TODO - CPPUNIT_TEST(testKhmer); CPPUNIT_TEST(testNorthernThai); #endif + + CPPUNIT_TEST(testWordBoundaries); +#if (U_ICU_VERSION_MAJOR_NUM > 4) + CPPUNIT_TEST(testKhmer); +#endif +#if (U_ICU_VERSION_MAJOR_NUM > 51) + CPPUNIT_TEST(testLao); #endif CPPUNIT_TEST(testJapanese); CPPUNIT_TEST(testChinese); @@ -883,13 +884,12 @@ void TestBreakIterator::testNorthernThai() CPPUNIT_ASSERT_MESSAGE("Should skip full word", aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); } +#endif +#if (U_ICU_VERSION_MAJOR_NUM > 4) // Not sure if any version earlier than 49 did have Khmer word boundary // dictionaries, 4.6 does not. -// As of icu 54, word boundary detection for Khmer is still considered -// insufficient, so icu khmer stuff is disabled - //A test to ensure that our khmer word boundary detection is useful //https://bugs.libreoffice.org/show_bug.cgi?id=52020 void TestBreakIterator::testKhmer() diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx index 36786308c65f..126114c2c195 100644 --- a/i18npool/source/breakiterator/breakiterator_unicode.cxx +++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx @@ -123,8 +123,8 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star:: rbi = new OOoRuleBasedBreakIterator(udata_open("OpenOffice", "brk", OUStringToOString(breakRules[breakType], RTL_TEXTENCODING_ASCII_US).getStr(), &status), status); } - //use icu's breakiterator for Thai, Tibetan and Dzongkha - else if (rLocale.Language != "th" && rLocale.Language != "lo" && rLocale.Language != "bo" && rLocale.Language != "dz") + //use icu's breakiterator for Thai, Khmer, Tibetan and Dzongkha + else if (rLocale.Language != "th" && rLocale.Language != "lo" && rLocale.Language != "km" && rLocale.Language != "bo" && rLocale.Language != "dz") { status = U_ZERO_ERROR; OStringBuffer aUDName(64); |