diff options
author | Eike Rathke <erack@redhat.com> | 2017-12-18 20:28:07 +0100 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2017-12-19 13:07:44 +0100 |
commit | f7961456d81c3ee6ee4c13eac9ef7add6c7ea6b5 (patch) | |
tree | 0a8939de9fce04674c79888602bad054fb3918ce /i18npool/source/breakiterator | |
parent | e6e85f139b250b1d48749bd336c28a7e46019993 (diff) |
Explicitly qualify ICU types with icu:: namespace
It will be required by ICU 61 anyway, see
https://ssl.icu-project.org/repos/icu/trunk/icu4c/readme.html#RecBuild
Change-Id: I16b6bc8b8c49713f32424df5fc6db494df7b6892
Reviewed-on: https://gerrit.libreoffice.org/46738
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'i18npool/source/breakiterator')
-rw-r--r-- | i18npool/source/breakiterator/breakiterator_unicode.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx index a81a80e153ba..02da856a5b99 100644 --- a/i18npool/source/breakiterator/breakiterator_unicode.cxx +++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx @@ -56,14 +56,14 @@ BreakIterator_Unicode::~BreakIterator_Unicode() } /* - Wrapper class to provide public access to the RuleBasedBreakIterator's + Wrapper class to provide public access to the icu::RuleBasedBreakIterator's setbreakType method. */ -class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator +class OOoRuleBasedBreakIterator : public icu::RuleBasedBreakIterator { public: #if (U_ICU_VERSION_MAJOR_NUM < 58) - // RuleBasedBreakIterator::setBreakType() is private as of ICU 58. + // icu::RuleBasedBreakIterator::setBreakType() is private as of ICU 58. void publicSetBreakType(int32_t type) { setBreakType(type); @@ -71,7 +71,7 @@ class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator #endif OOoRuleBasedBreakIterator(UDataMemory* image, UErrorCode &status) - : RuleBasedBreakIterator(image, status) + : icu::RuleBasedBreakIterator(image, status) { }; }; @@ -334,7 +334,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::nextCharacters( const OUString& Text, icu::BreakIterator* pBI = character.mpValue->mpBreakIterator.get(); for (nDone = 0; nDone < nCount; nDone++) { nStartPos = pBI->following(nStartPos); - if (nStartPos == BreakIterator::DONE) + if (nStartPos == icu::BreakIterator::DONE) return Text.getLength(); } } else { // for CHARACTER mode @@ -353,7 +353,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::previousCharacters( const OUString& Te icu::BreakIterator* pBI = character.mpValue->mpBreakIterator.get(); for (nDone = 0; nDone < nCount; nDone++) { nStartPos = pBI->preceding(nStartPos); - if (nStartPos == BreakIterator::DONE) + if (nStartPos == icu::BreakIterator::DONE) return 0; } } else { // for BS to delete one char and CHARACTER mode. @@ -371,7 +371,7 @@ Boundary SAL_CALL BreakIterator_Unicode::nextWord( const OUString& Text, sal_Int Boundary rv; rv.startPos = icuBI->mpValue->mpBreakIterator->following(nStartPos); - if( rv.startPos >= Text.getLength() || rv.startPos == BreakIterator::DONE ) + if( rv.startPos >= Text.getLength() || rv.startPos == icu::BreakIterator::DONE ) rv.endPos = result.startPos; else { if ( (rWordType == WordType::ANYWORD_IGNOREWHITESPACES || @@ -380,7 +380,7 @@ Boundary SAL_CALL BreakIterator_Unicode::nextWord( const OUString& Text, sal_Int rv.startPos = icuBI->mpValue->mpBreakIterator->following(rv.startPos); rv.endPos = icuBI->mpValue->mpBreakIterator->following(rv.startPos); - if(rv.endPos == BreakIterator::DONE) + if(rv.endPos == icu::BreakIterator::DONE) rv.endPos = rv.startPos; } return rv; @@ -394,7 +394,7 @@ Boundary SAL_CALL BreakIterator_Unicode::previousWord(const OUString& Text, sal_ Boundary rv; rv.startPos = icuBI->mpValue->mpBreakIterator->preceding(nStartPos); - if( rv.startPos < 0 || rv.startPos == BreakIterator::DONE) + if( rv.startPos < 0 || rv.startPos == icu::BreakIterator::DONE) rv.endPos = rv.startPos; else { if ( (rWordType == WordType::ANYWORD_IGNOREWHITESPACES || @@ -403,7 +403,7 @@ Boundary SAL_CALL BreakIterator_Unicode::previousWord(const OUString& Text, sal_ rv.startPos = icuBI->mpValue->mpBreakIterator->preceding(rv.startPos); rv.endPos = icuBI->mpValue->mpBreakIterator->following(rv.startPos); - if(rv.endPos == BreakIterator::DONE) + if(rv.endPos == icu::BreakIterator::DONE) rv.endPos = rv.startPos; } return rv; @@ -435,9 +435,9 @@ Boundary SAL_CALL BreakIterator_Unicode::getWordBoundary( const OUString& Text, rv.endPos = icuBI->mpValue->mpBreakIterator->following(nPos); } } - if (rv.startPos == BreakIterator::DONE) + if (rv.startPos == icu::BreakIterator::DONE) rv.startPos = rv.endPos; - else if (rv.endPos == BreakIterator::DONE) + else if (rv.endPos == icu::BreakIterator::DONE) rv.endPos = rv.startPos; return rv; @@ -502,7 +502,7 @@ LineBreakResults SAL_CALL BreakIterator_Unicode::getLineBreak( lbr.breakIndex = nStartPos; lbr.breakType = BreakType::WORDBOUNDARY; } else if (hOptions.rHyphenator.is()) { //Hyphenation break - sal_Int32 boundary_with_punctuation = (pLineBI->next() != BreakIterator::DONE) ? pLineBI->current() : 0; + sal_Int32 boundary_with_punctuation = (pLineBI->next() != icu::BreakIterator::DONE) ? pLineBI->current() : 0; pLineBI->preceding(nStartPos + 1); // reset to check correct hyphenation of "word-word" sal_Int32 nStartPosWordEnd = nStartPos; |