[Libreoffice-commits] core.git: 3 commits - i18nutil/source lotuswordpro/source opencl/source

[Eike Rathke]

 i18nutil/source/utility/unicode.cxx      |    8 ++++----
 lotuswordpro/source/filter/localtime.cxx |    2 +-
 opencl/source/openclconfig.cxx           |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 8960ecc689ce41cfaa40b65d75830d7491b06463
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Dec 18 20:41:30 2017 +0100

    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: Ib7accd75a6e35932048d779cf7bf0a5a33f8ed0d
    Reviewed-on: https://gerrit.libreoffice.org/46741
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/opencl/source/openclconfig.cxx b/opencl/source/openclconfig.cxx
index b81ffed22937..0ec2347fb332 100644
--- a/opencl/source/openclconfig.cxx
+++ b/opencl/source/openclconfig.cxx
@@ -119,7 +119,7 @@ bool match(const OUString& rPattern, const OUString& rInput)
     UErrorCode nIcuError(U_ZERO_ERROR);
     icu::UnicodeString sIcuPattern(reinterpret_cast<const UChar*>(rPattern.getStr()), rPattern.getLength());
     icu::UnicodeString sIcuInput(reinterpret_cast<const UChar*>(rInput.getStr()), rInput.getLength());
-    RegexMatcher aMatcher(sIcuPattern, sIcuInput, 0, nIcuError);
+    icu::RegexMatcher aMatcher(sIcuPattern, sIcuInput, 0, nIcuError);
 
     return U_SUCCESS(nIcuError) && aMatcher.matches(nIcuError) && U_SUCCESS(nIcuError);
 }
commit 7c46e0086802c22f5a5040d9161d4d2b3b2a3aff
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Dec 18 20:38:59 2017 +0100

    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: If7f1330550981fd28eb7eea6329f21e116291cca
    Reviewed-on: https://gerrit.libreoffice.org/46740
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/lotuswordpro/source/filter/localtime.cxx b/lotuswordpro/source/filter/localtime.cxx
index 47d202412724..3805c5d6f973 100644
--- a/lotuswordpro/source/filter/localtime.cxx
+++ b/lotuswordpro/source/filter/localtime.cxx
@@ -174,7 +174,7 @@ bool LtgLocalTime(long rtime,LtTm& rtm)
 
     if ((rtime > 3 * DAY_SEC)&&(rtime < LONG_MAX - 3 * DAY_SEC))
     {
-        TimeZone* pLocalZone = TimeZone::createDefault();
+        icu::TimeZone* pLocalZone = icu::TimeZone::createDefault();
         long offset = (pLocalZone->getRawOffset())/1000;
         delete pLocalZone;
         long ltime = rtime + offset;
commit ad3b7c27cdc957a8a38876c040e86a81c3cf7003
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Dec 18 20:33:03 2017 +0100

    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: Ia051e8e2aa64b0e32a7f16a2afebaef0e4ebf531
    Reviewed-on: https://gerrit.libreoffice.org/46739
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
index 96c0194a9149..f225b3adc55d 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -750,15 +750,15 @@ OUString unicode::formatPercent(double dNumber,
 
     icu::Locale aLocale = LanguageTagIcu::getIcuLocale(aLangTag);
 
-    std::unique_ptr<NumberFormat> xF(
-        NumberFormat::createPercentInstance(aLocale, errorCode));
+    std::unique_ptr<icu::NumberFormat> xF(
+        icu::NumberFormat::createPercentInstance(aLocale, errorCode));
     if(U_FAILURE(errorCode))
     {
-        SAL_WARN("i18n", "NumberFormat::createPercentInstance failed");
+        SAL_WARN("i18n", "icu::NumberFormat::createPercentInstance failed");
         return OUString::number(dNumber) + "%";
     }
 
-    UnicodeString output;
+    icu::UnicodeString output;
     xF->format(dNumber/100, output);
     OUString aRet(reinterpret_cast<const sal_Unicode *>(output.getBuffer()),
         output.length());