diff options
Diffstat (limited to 'i18npool/source/search')
| -rw-r--r-- | i18npool/source/search/textsearch.cxx | 8 | ||||
| -rw-r--r-- | i18npool/source/search/textsearch.hxx | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx index 13990e55827f..09841d207dd8 100644 --- a/i18npool/source/search/textsearch.cxx +++ b/i18npool/source/search/textsearch.cxx @@ -838,19 +838,19 @@ void TextSearch::RESrchPrepare( const css::util::SearchOptions2& rOptions) // - by replacing \< with "word-break followed by a look-ahead word-char" static const IcuUniString aChevronPatternB( "\\\\<", -1, IcuUniString::kInvariant); static const IcuUniString aChevronReplaceB( "\\\\b(?=\\\\w)", -1, IcuUniString::kInvariant); - static RegexMatcher aChevronMatcherB( aChevronPatternB, 0, nIcuErr); + static icu::RegexMatcher aChevronMatcherB( aChevronPatternB, 0, nIcuErr); aChevronMatcherB.reset( aIcuSearchPatStr); aIcuSearchPatStr = aChevronMatcherB.replaceAll( aChevronReplaceB, nIcuErr); aChevronMatcherB.reset(); // - by replacing \> with "look-behind word-char followed by a word-break" static const IcuUniString aChevronPatternE( "\\\\>", -1, IcuUniString::kInvariant); static const IcuUniString aChevronReplaceE( "(?<=\\\\w)\\\\b", -1, IcuUniString::kInvariant); - static RegexMatcher aChevronMatcherE( aChevronPatternE, 0, nIcuErr); + static icu::RegexMatcher aChevronMatcherE( aChevronPatternE, 0, nIcuErr); aChevronMatcherE.reset( aIcuSearchPatStr); aIcuSearchPatStr = aChevronMatcherE.replaceAll( aChevronReplaceE, nIcuErr); aChevronMatcherE.reset(); #endif - pRegexMatcher.reset( new RegexMatcher( aIcuSearchPatStr, nIcuSearchFlags, nIcuErr) ); + pRegexMatcher.reset( new icu::RegexMatcher( aIcuSearchPatStr, nIcuSearchFlags, nIcuErr) ); if (nIcuErr) { SAL_INFO( "i18npool", "TextSearch::RESrchPrepare UErrorCode " << nIcuErr); @@ -878,7 +878,7 @@ void TextSearch::RESrchPrepare( const css::util::SearchOptions2& rOptions) } -static bool lcl_findRegex( std::unique_ptr<RegexMatcher> const & pRegexMatcher, sal_Int32 nStartPos, UErrorCode & rIcuErr ) +static bool lcl_findRegex( std::unique_ptr<icu::RegexMatcher> const & pRegexMatcher, sal_Int32 nStartPos, UErrorCode & rIcuErr ) { if (!pRegexMatcher->find( nStartPos, rIcuErr)) { diff --git a/i18npool/source/search/textsearch.hxx b/i18npool/source/search/textsearch.hxx index acc49a00ee5a..aa4c8f522f86 100644 --- a/i18npool/source/search/textsearch.hxx +++ b/i18npool/source/search/textsearch.hxx @@ -37,7 +37,6 @@ namespace com::sun::star::i18n { class XExtendedTransliteration; } namespace com::sun::star::uno { class XComponentContext; } -using namespace U_ICU_NAMESPACE; typedef U_ICU_NAMESPACE::UnicodeString IcuUniString; class WLevDistance; @@ -89,7 +88,7 @@ class TextSearch: public cppu::WeakImplHelper sal_Int32 startPos, sal_Int32 endPos ); // Members and methods for the regular expression search - std::unique_ptr<RegexMatcher> pRegexMatcher; + std::unique_ptr<icu::RegexMatcher> pRegexMatcher; /// @throws css::uno::RuntimeException css::util::SearchResult SAL_CALL RESrchFrwrd( const OUString& searchStr, |