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

[Stephan Bergmann]

 lotuswordpro/source/filter/localtime.cxx |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit caf64a8c814bf821eef302fc6c2570c05b7fb169
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Apr 17 11:53:08 2016 +0200

    Avoid reserved identifiers
    
    Change-Id: I48654972e66b9a298940d800b2e04018cfd5bef8

diff --git a/lotuswordpro/source/filter/localtime.cxx b/lotuswordpro/source/filter/localtime.cxx
index 66455a4..d6be857 100644
--- a/lotuswordpro/source/filter/localtime.cxx
+++ b/lotuswordpro/source/filter/localtime.cxx
@@ -66,10 +66,6 @@ const long LONG_MAX=2147483647;
 //01-01-70 was a Thursday
 const long BASE_DOW = 4;
 
-long _lpdays[] = {-1, 30, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365};
-
-long _days[] = {-1, 30, 58, 89, 119, 150, 180, 211, 242, 272, 303, 333, 364};
-
 bool LtgGmTime(long rtime,LtTm& rtm)
 {
     if (rtime < 0)
@@ -129,14 +125,18 @@ bool LtgGmTime(long rtime,LtTm& rtm)
 
     //Determine months since January (0 - 11) and day of month (1 - 31)
 
-    long* mdays;
+    long const * mdays;
     if ( islpyr )
     {
-        mdays = _lpdays;
+        static long const lpdays[] =
+            {-1, 30, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365};
+        mdays = lpdays;
     }
     else
     {
-        mdays = _days;
+        static long const days[] =
+            {-1, 30, 58, 89, 119, 150, 180, 211, 242, 272, 303, 333, 364};
+        mdays = days;
     }
 
     for ( tmptim = 1 ; mdays[tmptim] < rtm.tm_yday ; tmptim++ ) ;