1543153
From cc0b086988c23525f6f7825cb735e8a0d1c54720 Mon Sep 17 00:00:00 2001
1543153
From: Eike Rathke <erack@redhat.com>
1543153
Date: Mon, 18 Dec 2017 20:28:07 +0100
1543153
Subject: [PATCH] Explicitly qualify ICU types with icu:: namespace
1543153
1543153
It will be required by ICU 61 anyway, see
1543153
https://ssl.icu-project.org/repos/icu/trunk/icu4c/readme.html#RecBuild
1543153
1543153
Change-Id: I16b6bc8b8c49713f32424df5fc6db494df7b6892
1543153
Reviewed-on: https://gerrit.libreoffice.org/46738
1543153
Reviewed-by: Eike Rathke <erack@redhat.com>
1543153
Tested-by: Eike Rathke <erack@redhat.com>
1543153
(cherry picked from commit f7961456d81c3ee6ee4c13eac9ef7add6c7ea6b5)
1543153
Reviewed-on: https://gerrit.libreoffice.org/56664
1543153
Tested-by: Jenkins
1543153
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
1543153
---
1543153
 i18npool/inc/collator_unicode.hxx             |  2 +-
1543153
 .../breakiterator/breakiterator_unicode.cxx   | 26 +++++++++----------
1543153
 i18npool/source/collator/collator_unicode.cxx | 16 ++++++------
1543153
 i18npool/source/collator/gencoll_rule.cxx     |  2 +-
1543153
 .../source/ordinalsuffix/ordinalsuffix.cxx    |  2 +-
1543153
 .../transliteration/ignoreDiacritics_CTL.cxx  |  6 ++---
1543153
 6 files changed, 27 insertions(+), 27 deletions(-)
1543153
1543153
diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx
1543153
index 69d317797870..d943bc9bc2c1 100644
1543153
--- a/i18npool/inc/collator_unicode.hxx
1543153
+++ b/i18npool/inc/collator_unicode.hxx
1543153
@@ -63,7 +63,7 @@ public:
1543153
 
1543153
 private:
1543153
     const sal_Char *implementationName;
1543153
-    RuleBasedCollator *uca_base, *collator;
1543153
+    icu::RuleBasedCollator *uca_base, *collator;
1543153
 #ifndef DISABLE_DYNLOADING
1543153
     oslModule hModule;
1543153
 #endif
1543153
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
1543153
index b4ca111179c1..77fabbfce84b 100644
1543153
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
1543153
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
1543153
@@ -56,14 +56,14 @@ BreakIterator_Unicode::~BreakIterator_Unicode()
1543153
 }
1543153
 
1543153
 /*
1543153
-    Wrapper class to provide public access to the RuleBasedBreakIterator's
1543153
+    Wrapper class to provide public access to the icu::RuleBasedBreakIterator's
1543153
     setbreakType method.
1543153
 */
1543153
-class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator
1543153
+class OOoRuleBasedBreakIterator : public icu::RuleBasedBreakIterator
1543153
 {
1543153
     public:
1543153
 #if (U_ICU_VERSION_MAJOR_NUM < 58)
1543153
-    // RuleBasedBreakIterator::setBreakType() is private as of ICU 58.
1543153
+    // icu::RuleBasedBreakIterator::setBreakType() is private as of ICU 58.
1543153
     void publicSetBreakType(int32_t type)
1543153
         {
1543153
             setBreakType(type);
1543153
@@ -71,7 +71,7 @@ class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator
1543153
 #endif
1543153
     OOoRuleBasedBreakIterator(UDataMemory* image,
1543153
                               UErrorCode &status)
1543153
-        : RuleBasedBreakIterator(image, status)
1543153
+        : icu::RuleBasedBreakIterator(image, status)
1543153
         { };
1543153
 
1543153
 };
1543153
@@ -334,7 +334,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::nextCharacters( const OUString& Text,
1543153
         icu::BreakIterator* pBI = character.mpValue->mpBreakIterator.get();
1543153
         for (nDone = 0; nDone < nCount; nDone++) {
1543153
             nStartPos = pBI->following(nStartPos);
1543153
-            if (nStartPos == BreakIterator::DONE)
1543153
+            if (nStartPos == icu::BreakIterator::DONE)
1543153
                 return Text.getLength();
1543153
         }
1543153
     } else { // for CHARACTER mode
1543153
@@ -353,7 +353,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::previousCharacters( const OUString& Te
1543153
         icu::BreakIterator* pBI = character.mpValue->mpBreakIterator.get();
1543153
         for (nDone = 0; nDone < nCount; nDone++) {
1543153
             nStartPos = pBI->preceding(nStartPos);
1543153
-            if (nStartPos == BreakIterator::DONE)
1543153
+            if (nStartPos == icu::BreakIterator::DONE)
1543153
                 return 0;
1543153
         }
1543153
     } else { // for BS to delete one char and CHARACTER mode.
1543153
@@ -371,7 +371,7 @@ Boundary SAL_CALL BreakIterator_Unicode::nextWord( const OUString& Text, sal_Int
1543153
 
1543153
     Boundary rv;
1543153
     rv.startPos = icuBI->mpValue->mpBreakIterator->following(nStartPos);
1543153
-    if( rv.startPos >= Text.getLength() || rv.startPos == BreakIterator::DONE )
1543153
+    if( rv.startPos >= Text.getLength() || rv.startPos == icu::BreakIterator::DONE )
1543153
         rv.endPos = result.startPos;
1543153
     else {
1543153
         if ( (rWordType == WordType::ANYWORD_IGNOREWHITESPACES ||
1543153
@@ -380,7 +380,7 @@ Boundary SAL_CALL BreakIterator_Unicode::nextWord( const OUString& Text, sal_Int
1543153
             rv.startPos = icuBI->mpValue->mpBreakIterator->following(rv.startPos);
1543153
 
1543153
         rv.endPos = icuBI->mpValue->mpBreakIterator->following(rv.startPos);
1543153
-        if(rv.endPos == BreakIterator::DONE)
1543153
+        if(rv.endPos == icu::BreakIterator::DONE)
1543153
             rv.endPos = rv.startPos;
1543153
     }
1543153
     return rv;
1543153
@@ -394,7 +394,7 @@ Boundary SAL_CALL BreakIterator_Unicode::previousWord(const OUString& Text, sal_
1543153
 
1543153
     Boundary rv;
1543153
     rv.startPos = icuBI->mpValue->mpBreakIterator->preceding(nStartPos);
1543153
-    if( rv.startPos < 0 || rv.startPos == BreakIterator::DONE)
1543153
+    if( rv.startPos < 0 || rv.startPos == icu::BreakIterator::DONE)
1543153
         rv.endPos = rv.startPos;
1543153
     else {
1543153
         if ( (rWordType == WordType::ANYWORD_IGNOREWHITESPACES ||
1543153
@@ -403,7 +403,7 @@ Boundary SAL_CALL BreakIterator_Unicode::previousWord(const OUString& Text, sal_
1543153
             rv.startPos = icuBI->mpValue->mpBreakIterator->preceding(rv.startPos);
1543153
 
1543153
         rv.endPos = icuBI->mpValue->mpBreakIterator->following(rv.startPos);
1543153
-        if(rv.endPos == BreakIterator::DONE)
1543153
+        if(rv.endPos == icu::BreakIterator::DONE)
1543153
             rv.endPos = rv.startPos;
1543153
     }
1543153
     return rv;
1543153
@@ -435,9 +435,9 @@ Boundary SAL_CALL BreakIterator_Unicode::getWordBoundary( const OUString& Text,
1543153
             rv.endPos = icuBI->mpValue->mpBreakIterator->following(nPos);
1543153
         }
1543153
     }
1543153
-    if (rv.startPos == BreakIterator::DONE)
1543153
+    if (rv.startPos == icu::BreakIterator::DONE)
1543153
         rv.startPos = rv.endPos;
1543153
-    else if (rv.endPos == BreakIterator::DONE)
1543153
+    else if (rv.endPos == icu::BreakIterator::DONE)
1543153
         rv.endPos = rv.startPos;
1543153
 
1543153
     return rv;
1543153
@@ -502,7 +502,7 @@ LineBreakResults SAL_CALL BreakIterator_Unicode::getLineBreak(
1543153
             lbr.breakIndex = nStartPos;
1543153
             lbr.breakType = BreakType::WORDBOUNDARY;
1543153
         } else if (hOptions.rHyphenator.is()) { //Hyphenation break
1543153
-            sal_Int32 boundary_with_punctuation = (pLineBI->next() != BreakIterator::DONE) ? pLineBI->current() : 0;
1543153
+            sal_Int32 boundary_with_punctuation = (pLineBI->next() != icu::BreakIterator::DONE) ? pLineBI->current() : 0;
1543153
             pLineBI->preceding(nStartPos + 1); // reset to check correct hyphenation of "word-word"
1543153
 
1543153
             sal_Int32 nStartPosWordEnd = nStartPos;
1543153
diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
1543153
index 22b7ed9ae492..552c95ed35f1 100644
1543153
--- a/i18npool/source/collator/collator_unicode.cxx
1543153
+++ b/i18npool/source/collator/collator_unicode.cxx
1543153
@@ -138,7 +138,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
1543153
         UErrorCode status = U_ZERO_ERROR;
1543153
         OUString rule = LocaleDataImpl::get()->getCollatorRuleByAlgorithm(rLocale, rAlgorithm);
1543153
         if (!rule.isEmpty()) {
1543153
-            collator = new RuleBasedCollator(reinterpret_cast<const UChar *>(rule.getStr()), status);
1543153
+            collator = new icu::RuleBasedCollator(reinterpret_cast<const UChar *>(rule.getStr()), status);
1543153
             if (! U_SUCCESS(status)) throw RuntimeException();
1543153
         }
1543153
         if (!collator && OUString(LOCAL_RULE_LANGS).indexOf(rLocale.Language) >= 0) {
1543153
@@ -343,7 +343,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
1543153
                 size_t ruleImageSize = funclen();
1543153
 
1543153
 #if (U_ICU_VERSION_MAJOR_NUM == 4) && (U_ICU_VERSION_MINOR_NUM <= 2)
1543153
-                uca_base = new RuleBasedCollator(static_cast<UChar*>(NULL), status);
1543153
+                uca_base = new icu::RuleBasedCollator(static_cast<UChar*>(NULL), status);
1543153
 #else
1543153
                 // Not only changed ICU 53.1 the API behavior that a negative
1543153
                 // length (ruleImageSize) now leads to failure, but also that
1543153
@@ -354,11 +354,11 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
1543153
                 // The default collator of the en-US locale would also fulfill
1543153
                 // the requirement. The collator of the actual locale or the
1543153
                 // NULL (default) locale does not.
1543153
-                uca_base = static_cast<RuleBasedCollator*>(icu::Collator::createInstance(
1543153
+                uca_base = static_cast<icu::RuleBasedCollator*>(icu::Collator::createInstance(
1543153
                             icu::Locale::getRoot(), status));
1543153
 #endif
1543153
                 if (! U_SUCCESS(status)) throw RuntimeException();
1543153
-                collator = new RuleBasedCollator(
1543153
+                collator = new icu::RuleBasedCollator(
1543153
                         reinterpret_cast<const uint8_t*>(ruleImage), ruleImageSize, uca_base, status);
1543153
                 if (! U_SUCCESS(status)) throw RuntimeException();
1543153
             }
1543153
@@ -372,17 +372,17 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
1543153
             */
1543153
             icu::Locale icuLocale( LanguageTagIcu::getIcuLocale( LanguageTag( rLocale), rAlgorithm));
1543153
             // load ICU collator
1543153
-            collator = static_cast<RuleBasedCollator*>( icu::Collator::createInstance(icuLocale, status) );
1543153
+            collator = static_cast<icu::RuleBasedCollator*>( icu::Collator::createInstance(icuLocale, status) );
1543153
             if (! U_SUCCESS(status)) throw RuntimeException();
1543153
         }
1543153
     }
1543153
 
1543153
     if (options & CollatorOptions::CollatorOptions_IGNORE_CASE_ACCENT)
1543153
-        collator->setStrength(Collator::PRIMARY);
1543153
+        collator->setStrength(icu::Collator::PRIMARY);
1543153
     else if (options & CollatorOptions::CollatorOptions_IGNORE_CASE)
1543153
-        collator->setStrength(Collator::SECONDARY);
1543153
+        collator->setStrength(icu::Collator::SECONDARY);
1543153
     else
1543153
-        collator->setStrength(Collator::TERTIARY);
1543153
+        collator->setStrength(icu::Collator::TERTIARY);
1543153
 
1543153
     return 0;
1543153
 }
1543153
diff --git a/i18npool/source/collator/gencoll_rule.cxx b/i18npool/source/collator/gencoll_rule.cxx
1543153
index 7d795b5af079..3048d12bb90b 100644
1543153
--- a/i18npool/source/collator/gencoll_rule.cxx
1543153
+++ b/i18npool/source/collator/gencoll_rule.cxx
1543153
@@ -113,7 +113,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
1543153
     //UCollator *coll = ucol_openRules(Obuf.getStr(), Obuf.getLength(), UCOL_OFF,
1543153
     //        UCOL_DEFAULT_STRENGTH, &parseError, &status);
1543153
 
1543153
-    auto coll = o3tl::make_unique<RuleBasedCollator>(reinterpret_cast<const UChar *>(Obuf.getStr()), status);
1543153
+    auto coll = o3tl::make_unique<icu::RuleBasedCollator>(reinterpret_cast<const UChar *>(Obuf.getStr()), status);
1543153
 
1543153
     if (U_SUCCESS(status)) {
1543153
         std::vector<uint8_t> data;
1543153
diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
1543153
index a3e7d4ab6e8e..f32579894d44 100644
1543153
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
1543153
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
1543153
@@ -79,7 +79,7 @@ uno::Sequence< OUString > SAL_CALL OrdinalSuffixService::getOrdinalSuffix( sal_I
1543153
     if (!U_SUCCESS(nCode))
1543153
         return retValue;
1543153
 
1543153
-    std::unique_ptr<NumberFormat> xNumberFormat(icu::NumberFormat::createInstance(aIcuLocale, nCode));
1543153
+    std::unique_ptr<icu::NumberFormat> xNumberFormat(icu::NumberFormat::createInstance(aIcuLocale, nCode));
1543153
     if (!U_SUCCESS(nCode))
1543153
         return retValue;
1543153
 
1543153
diff --git a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
1543153
index 0ddfe645abaa..2b5ca1ed1bdb 100644
1543153
--- a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
1543153
+++ b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
1543153
@@ -35,7 +35,7 @@ ignoreDiacritics_CTL::transliterateChar2Char(sal_Unicode nInChar)
1543153
     if (!m_transliterator)
1543153
         throw css::uno::RuntimeException();
1543153
 
1543153
-    UnicodeString aChar(nInChar);
1543153
+    icu::UnicodeString aChar(nInChar);
1543153
     m_transliterator->transliterate(aChar);
1543153
 
1543153
     if (aChar.isEmpty())
1543153
@@ -68,7 +68,7 @@ ignoreDiacritics_CTL::folding(const OUString& rInStr, sal_Int32 nStartPos,
1543153
         {
1543153
             sal_Int32 nIndex = nPosition;
1543153
             UChar32 nChar = rInStr.iterateCodePoints(&nIndex);
1543153
-            UnicodeString aUStr(nChar);
1543153
+            icu::UnicodeString aUStr(nChar);
1543153
             m_transliterator->transliterate(aUStr);
1543153
 
1543153
             if (nOffset + aUStr.length() > rOffset.getLength())
1543153
@@ -87,7 +87,7 @@ ignoreDiacritics_CTL::folding(const OUString& rInStr, sal_Int32 nStartPos,
1543153
     }
1543153
     else
1543153
     {
1543153
-        UnicodeString aUStr(reinterpret_cast<const UChar*>(rInStr.getStr()) + nStartPos, nCount);
1543153
+        icu::UnicodeString aUStr(reinterpret_cast<const UChar*>(rInStr.getStr()) + nStartPos, nCount);
1543153
         m_transliterator->transliterate(aUStr);
1543153
         return OUString(reinterpret_cast<const sal_Unicode*>(aUStr.getBuffer()), aUStr.length());
1543153
     }
1543153
-- 
1543153
2.17.1
1543153
7dc833a
From 8790243df458250b00de67bf6fc892b3fa5660ad Mon Sep 17 00:00:00 2001
7dc833a
From: Eike Rathke <erack@redhat.com>
7dc833a
Date: Mon, 18 Dec 2017 20:41:30 +0100
7dc833a
Subject: [PATCH] Explicitly qualify ICU types with icu:: namespace
7dc833a
7dc833a
It will be required by ICU 61 anyway, see
7dc833a
https://ssl.icu-project.org/repos/icu/trunk/icu4c/readme.html#RecBuild
7dc833a
7dc833a
Change-Id: Ib7accd75a6e35932048d779cf7bf0a5a33f8ed0d
7dc833a
Reviewed-on: https://gerrit.libreoffice.org/46741
7dc833a
Reviewed-by: Eike Rathke <erack@redhat.com>
7dc833a
Tested-by: Eike Rathke <erack@redhat.com>
7dc833a
(cherry picked from commit 8960ecc689ce41cfaa40b65d75830d7491b06463)
7dc833a
Reviewed-on: https://gerrit.libreoffice.org/56680
7dc833a
Tested-by: Jenkins
7dc833a
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
7dc833a
---
7dc833a
 opencl/source/openclconfig.cxx | 2 +-
7dc833a
 1 file changed, 1 insertion(+), 1 deletion(-)
7dc833a
7dc833a
diff --git a/opencl/source/openclconfig.cxx b/opencl/source/openclconfig.cxx
7dc833a
index b81ffed22937..0ec2347fb332 100644
7dc833a
--- a/opencl/source/openclconfig.cxx
7dc833a
+++ b/opencl/source/openclconfig.cxx
7dc833a
@@ -119,7 +119,7 @@ bool match(const OUString& rPattern, const OUString& rInput)
7dc833a
     UErrorCode nIcuError(U_ZERO_ERROR);
7dc833a
     icu::UnicodeString sIcuPattern(reinterpret_cast<const UChar*>(rPattern.getStr()), rPattern.getLength());
7dc833a
     icu::UnicodeString sIcuInput(reinterpret_cast<const UChar*>(rInput.getStr()), rInput.getLength());
7dc833a
-    RegexMatcher aMatcher(sIcuPattern, sIcuInput, 0, nIcuError);
7dc833a
+    icu::RegexMatcher aMatcher(sIcuPattern, sIcuInput, 0, nIcuError);
7dc833a
 
7dc833a
     return U_SUCCESS(nIcuError) && aMatcher.matches(nIcuError) && U_SUCCESS(nIcuError);
7dc833a
 }
7dc833a
-- 
7dc833a
2.17.1
7dc833a
a6a21c0
From 63ebde2117d768c974252db9c4d9cce1ef4334c6 Mon Sep 17 00:00:00 2001
a6a21c0
From: Eike Rathke <erack@redhat.com>
a6a21c0
Date: Mon, 18 Dec 2017 20:33:03 +0100
a6a21c0
Subject: [PATCH] Explicitly qualify ICU types with icu:: namespace
a6a21c0
a6a21c0
It will be required by ICU 61 anyway, see
a6a21c0
https://ssl.icu-project.org/repos/icu/trunk/icu4c/readme.html#RecBuild
a6a21c0
a6a21c0
Change-Id: Ia051e8e2aa64b0e32a7f16a2afebaef0e4ebf531
a6a21c0
Reviewed-on: https://gerrit.libreoffice.org/46739
a6a21c0
Reviewed-by: Eike Rathke <erack@redhat.com>
a6a21c0
Tested-by: Eike Rathke <erack@redhat.com>
a6a21c0
(cherry picked from commit ad3b7c27cdc957a8a38876c040e86a81c3cf7003)
a6a21c0
Reviewed-on: https://gerrit.libreoffice.org/56713
a6a21c0
Tested-by: Jenkins
a6a21c0
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
a6a21c0
---
a6a21c0
 i18nutil/source/utility/unicode.cxx | 8 ++++----
a6a21c0
 1 file changed, 4 insertions(+), 4 deletions(-)
a6a21c0
a6a21c0
diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
a6a21c0
index 0173a4ad5fbf..697875b193e3 100644
a6a21c0
--- a/i18nutil/source/utility/unicode.cxx
a6a21c0
+++ b/i18nutil/source/utility/unicode.cxx
a6a21c0
@@ -750,15 +750,15 @@ OUString SAL_CALL unicode::formatPercent(double dNumber,
a6a21c0
 
a6a21c0
     icu::Locale aLocale = LanguageTagIcu::getIcuLocale(aLangTag);
a6a21c0
 
a6a21c0
-    std::unique_ptr<NumberFormat> xF(
a6a21c0
-        NumberFormat::createPercentInstance(aLocale, errorCode));
a6a21c0
+    std::unique_ptr<icu::NumberFormat> xF(
a6a21c0
+        icu::NumberFormat::createPercentInstance(aLocale, errorCode));
a6a21c0
     if(U_FAILURE(errorCode))
a6a21c0
     {
a6a21c0
-        SAL_WARN("i18n", "NumberFormat::createPercentInstance failed");
a6a21c0
+        SAL_WARN("i18n", "icu::NumberFormat::createPercentInstance failed");
a6a21c0
         return OUString::number(dNumber) + "%";
a6a21c0
     }
a6a21c0
 
a6a21c0
-    UnicodeString output;
a6a21c0
+    icu::UnicodeString output;
a6a21c0
     xF->format(dNumber/100, output);
a6a21c0
     OUString aRet(reinterpret_cast<const sal_Unicode *>(output.getBuffer()),
a6a21c0
         output.length());
a6a21c0
-- 
a6a21c0
2.17.1
a6a21c0
8f6bf77
From 4d06789a836f1a271399cd9955b2cb96030f393a Mon Sep 17 00:00:00 2001
8f6bf77
From: Eike Rathke <erack@redhat.com>
8f6bf77
Date: Tue, 19 Dec 2017 15:22:09 +0100
8f6bf77
Subject: [PATCH] vcl: explicitly qualify ICU types with icu:: namespace
8f6bf77
8f6bf77
It will be required by ICU 61 anyway, see
8f6bf77
https://ssl.icu-project.org/repos/icu/trunk/icu4c/readme.html#RecBuild
8f6bf77
8f6bf77
Change-Id: Iecb30b903e9a67252147a8cc78c641621d763755
8f6bf77
(cherry picked from commit f240332f8e965ea17b70b0ccaa9990ce0a53cfc6)
8f6bf77
Reviewed-on: https://gerrit.libreoffice.org/56735
8f6bf77
Tested-by: Jenkins
8f6bf77
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
8f6bf77
---
8f6bf77
 vcl/inc/scrptrun.h | 2 +-
8f6bf77
 1 file changed, 1 insertion(+), 1 deletion(-)
8f6bf77
8f6bf77
diff --git a/vcl/inc/scrptrun.h b/vcl/inc/scrptrun.h
8f6bf77
index cbe151df491d..46a5c08f3ab5 100644
8f6bf77
--- a/vcl/inc/scrptrun.h
8f6bf77
+++ b/vcl/inc/scrptrun.h
8f6bf77
@@ -58,7 +58,7 @@ struct ParenStackEntry
8f6bf77
     }
8f6bf77
 };
8f6bf77
 
8f6bf77
-class ScriptRun : public UObject {
8f6bf77
+class ScriptRun : public icu::UObject {
8f6bf77
 public:
8f6bf77
 
8f6bf77
     ScriptRun(const UChar chars[], int32_t length);
8f6bf77
-- 
8f6bf77
2.17.1
8f6bf77
aec8f09
From 39d2a681dd6b6b8b94770d7cade9099936e46e2d Mon Sep 17 00:00:00 2001
aec8f09
From: Eike Rathke <erack@redhat.com>
aec8f09
Date: Mon, 18 Dec 2017 20:38:59 +0100
aec8f09
Subject: [PATCH] Explicitly qualify ICU types with icu:: namespace
aec8f09
aec8f09
It will be required by ICU 61 anyway, see
aec8f09
https://ssl.icu-project.org/repos/icu/trunk/icu4c/readme.html#RecBuild
aec8f09
aec8f09
Change-Id: If7f1330550981fd28eb7eea6329f21e116291cca
aec8f09
Reviewed-on: https://gerrit.libreoffice.org/46740
aec8f09
Reviewed-by: Eike Rathke <erack@redhat.com>
aec8f09
Tested-by: Eike Rathke <erack@redhat.com>
aec8f09
---
aec8f09
 lotuswordpro/source/filter/localtime.cxx | 2 +-
aec8f09
 1 file changed, 1 insertion(+), 1 deletion(-)
aec8f09
aec8f09
diff --git a/lotuswordpro/source/filter/localtime.cxx b/lotuswordpro/source/filter/localtime.cxx
aec8f09
index 47d202412724..3805c5d6f973 100644
aec8f09
--- a/lotuswordpro/source/filter/localtime.cxx
aec8f09
+++ b/lotuswordpro/source/filter/localtime.cxx
aec8f09
@@ -174,7 +174,7 @@ bool LtgLocalTime(long rtime,LtTm& rtm)
aec8f09
 
aec8f09
     if ((rtime > 3 * DAY_SEC)&&(rtime < LONG_MAX - 3 * DAY_SEC))
aec8f09
     {
aec8f09
-        TimeZone* pLocalZone = TimeZone::createDefault();
aec8f09
+        icu::TimeZone* pLocalZone = icu::TimeZone::createDefault();
aec8f09
         long offset = (pLocalZone->getRawOffset())/1000;
aec8f09
         delete pLocalZone;
aec8f09
         long ltime = rtime + offset;
aec8f09
-- 
aec8f09
2.17.1
aec8f09