From 0dc4cbe342d93ce27b92c5a408adcb009b39b48f Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Thu, 10 Mar 2022 09:44:14 +0300 Subject: Use icu::UnicodeString directly Change-Id: I41b4e64d6d3a9310d819904c8d32c689e6300bcd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131296 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- i18npool/qa/cppunit/test_textsearch.cxx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'i18npool/qa') diff --git a/i18npool/qa/cppunit/test_textsearch.cxx b/i18npool/qa/cppunit/test_textsearch.cxx index 31c66d94cd8d..1d72a8d83f18 100644 --- a/i18npool/qa/cppunit/test_textsearch.cxx +++ b/i18npool/qa/cppunit/test_textsearch.cxx @@ -27,7 +27,6 @@ #include using namespace ::com::sun::star; -typedef U_ICU_NAMESPACE::UnicodeString IcuUniString; class TestTextSearch : public test::BootstrapFixtureBase { @@ -59,11 +58,11 @@ void TestTextSearch::testICU() OUString aString( "abcdefgh" ); OUString aPattern( "e" ); - IcuUniString aSearchPat( reinterpret_cast(aPattern.getStr()), aPattern.getLength() ); + icu::UnicodeString aSearchPat( reinterpret_cast(aPattern.getStr()), aPattern.getLength() ); std::unique_ptr pRegexMatcher(new icu::RegexMatcher( aSearchPat, nSearchFlags, nErr )); - IcuUniString aSource( reinterpret_cast(aString.getStr()), aString.getLength() ); + icu::UnicodeString aSource( reinterpret_cast(aString.getStr()), aString.getLength() ); pRegexMatcher->reset( aSource ); CPPUNIT_ASSERT( pRegexMatcher->find( 0, nErr ) ); @@ -76,10 +75,10 @@ void TestTextSearch::testICU() OUString aString2( "acababaabcababadcdaa" ); OUString aPattern2( "a" ); - IcuUniString aSearchPat2( reinterpret_cast(aPattern2.getStr()), aPattern2.getLength() ); + icu::UnicodeString aSearchPat2( reinterpret_cast(aPattern2.getStr()), aPattern2.getLength() ); pRegexMatcher.reset(new icu::RegexMatcher( aSearchPat2, nSearchFlags, nErr )); - IcuUniString aSource2( reinterpret_cast(aString2.getStr()), aString2.getLength() ); + icu::UnicodeString aSource2( reinterpret_cast(aString2.getStr()), aString2.getLength() ); pRegexMatcher->reset( aSource2 ); CPPUNIT_ASSERT( pRegexMatcher->find( 0, nErr ) ); -- cgit