[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - lotuswordpro/source

Eike Rathke erack at redhat.com
Mon Jul 2 06:19:54 UTC 2018


 lotuswordpro/source/filter/localtime.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3aabc93b8a3f55eb0a3f9e413b124fd8deab7e47
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>
    Reviewed-on: https://gerrit.libreoffice.org/56779
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman 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;


More information about the Libreoffice-commits mailing list