[Libreoffice-commits] core.git: i18npool/qa

[Caolán McNamara]

 i18npool/qa/cppunit/test_breakiterator.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 76e735b26aa834bd9fba83b60905ee870f82dac3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 30 17:30:01 2013 +0100

    enable building against RHEL-6 system icu
    
    Change-Id: I56f08d58d8d8a0e397412580451c90f9605bcb46

diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx
index b121f6d..6e8b288 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -233,14 +233,18 @@ 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)
     {
         //make sure that in all cases isBeginWord and isEndWord matches getWordBoundary
         for (size_t i = 0; i < SAL_N_ELEMENTS(aBreakTests); ++i)
         {
+#if (U_ICU_VERSION_MAJOR_NUM == 4) && (U_ICU_VERSION_MINOR_NUM <= 2)
+            //Note the breakiterator test is known to fail on older icu
+            //versions (4.2.1) for the 200B (ZWSP) Zero Width Space testcase.
+            if (aBreakTests[i] == 0x200B)
+                continue;
+#endif
             OUString aTest("Word");
             aTest += OUString(aBreakTests[i]) + OUString("Word");
             aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, mode, true);