diff --git a/ChangeLog-1999-07-09 b/ChangeLog-1999-07-09 index b9129833272e213649eae983fb85557194f9e6b9..d7f3f8d67060c0beeeed33fd74556ec64ad89403 100644 --- a/ChangeLog-1999-07-09 +++ b/ChangeLog-1999-07-09 @@ -1,5 +1,10 @@ 1998-10-28 Miguel de Icaza + * src/fn-date.c (gnumeric_date): Fix longstanding off by one + error. + (gnumeric_today): ditto + (gnumeric_now): ditto. + * Prepare for 0.4 release. * configure.in: Add test for new GTK+ selection code. diff --git a/ChangeLog-2000-02-23 b/ChangeLog-2000-02-23 index b9129833272e213649eae983fb85557194f9e6b9..d7f3f8d67060c0beeeed33fd74556ec64ad89403 100644 --- a/ChangeLog-2000-02-23 +++ b/ChangeLog-2000-02-23 @@ -1,5 +1,10 @@ 1998-10-28 Miguel de Icaza + * src/fn-date.c (gnumeric_date): Fix longstanding off by one + error. + (gnumeric_today): ditto + (gnumeric_now): ditto. + * Prepare for 0.4 release. * configure.in: Add test for new GTK+ selection code. diff --git a/OChangeLog-1999-07-09 b/OChangeLog-1999-07-09 index b9129833272e213649eae983fb85557194f9e6b9..d7f3f8d67060c0beeeed33fd74556ec64ad89403 100644 --- a/OChangeLog-1999-07-09 +++ b/OChangeLog-1999-07-09 @@ -1,5 +1,10 @@ 1998-10-28 Miguel de Icaza + * src/fn-date.c (gnumeric_date): Fix longstanding off by one + error. + (gnumeric_today): ditto + (gnumeric_now): ditto. + * Prepare for 0.4 release. * configure.in: Add test for new GTK+ selection code. diff --git a/OChangeLog-2000-02-23 b/OChangeLog-2000-02-23 index b9129833272e213649eae983fb85557194f9e6b9..d7f3f8d67060c0beeeed33fd74556ec64ad89403 100644 --- a/OChangeLog-2000-02-23 +++ b/OChangeLog-2000-02-23 @@ -1,5 +1,10 @@ 1998-10-28 Miguel de Icaza + * src/fn-date.c (gnumeric_date): Fix longstanding off by one + error. + (gnumeric_today): ditto + (gnumeric_now): ditto. + * Prepare for 0.4 release. * configure.in: Add test for new GTK+ selection code. diff --git a/plugins/fn-date/functions.c b/plugins/fn-date/functions.c index 1134ce52f56353e30816c43fb352ca2297df8d03..211f07974cdcc40119329fb77e9ddd7d6ad6b597 100644 --- a/plugins/fn-date/functions.c +++ b/plugins/fn-date/functions.c @@ -52,7 +52,7 @@ gnumeric_date (struct FunctionDefinition *fd, Value *argv [], char **error_strin } v = value_int ( calc_days (year, month, day) - - calc_days (1900, 1, 1) + 1); + calc_days (1900, 1, 1)); return v; } @@ -79,7 +79,7 @@ gnumeric_today (FunctionDefinition *fd, Value *argv [], char **error_string) v = value_int ( calc_days (tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday) - - calc_days (1900, 1, 1) + 1); + calc_days (1900, 1, 1)); return v; } @@ -115,7 +115,7 @@ gnumeric_now (FunctionDefinition *fd, Value *argv [], char **error_string) v = value_float ( calc_days (tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday) + ((tm->tm_hour * 3600 + tm->tm_min * 60 + tm->tm_sec)/(double)DAY_SECONDS) - - calc_days (1900, 1, 1) + 1); + calc_days (1900, 1, 1)); return v; } diff --git a/samples/test-date.gnumeric b/samples/test-date.gnumeric index e5d93a5c38684e048c63f4dacc4371cbf6ed4761..c6d11a4629acc92b5ab70ca46d8989ec668f9648 100644 Binary files a/samples/test-date.gnumeric and b/samples/test-date.gnumeric differ diff --git a/src/fn-date.c b/src/fn-date.c index 1134ce52f56353e30816c43fb352ca2297df8d03..211f07974cdcc40119329fb77e9ddd7d6ad6b597 100644 --- a/src/fn-date.c +++ b/src/fn-date.c @@ -52,7 +52,7 @@ gnumeric_date (struct FunctionDefinition *fd, Value *argv [], char **error_strin } v = value_int ( calc_days (year, month, day) - - calc_days (1900, 1, 1) + 1); + calc_days (1900, 1, 1)); return v; } @@ -79,7 +79,7 @@ gnumeric_today (FunctionDefinition *fd, Value *argv [], char **error_string) v = value_int ( calc_days (tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday) - - calc_days (1900, 1, 1) + 1); + calc_days (1900, 1, 1)); return v; } @@ -115,7 +115,7 @@ gnumeric_now (FunctionDefinition *fd, Value *argv [], char **error_string) v = value_float ( calc_days (tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday) + ((tm->tm_hour * 3600 + tm->tm_min * 60 + tm->tm_sec)/(double)DAY_SECONDS) - - calc_days (1900, 1, 1) + 1); + calc_days (1900, 1, 1)); return v; } diff --git a/src/functions/fn-date.c b/src/functions/fn-date.c index 1134ce52f56353e30816c43fb352ca2297df8d03..211f07974cdcc40119329fb77e9ddd7d6ad6b597 100644 --- a/src/functions/fn-date.c +++ b/src/functions/fn-date.c @@ -52,7 +52,7 @@ gnumeric_date (struct FunctionDefinition *fd, Value *argv [], char **error_strin } v = value_int ( calc_days (year, month, day) - - calc_days (1900, 1, 1) + 1); + calc_days (1900, 1, 1)); return v; } @@ -79,7 +79,7 @@ gnumeric_today (FunctionDefinition *fd, Value *argv [], char **error_string) v = value_int ( calc_days (tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday) - - calc_days (1900, 1, 1) + 1); + calc_days (1900, 1, 1)); return v; } @@ -115,7 +115,7 @@ gnumeric_now (FunctionDefinition *fd, Value *argv [], char **error_string) v = value_float ( calc_days (tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday) + ((tm->tm_hour * 3600 + tm->tm_min * 60 + tm->tm_sec)/(double)DAY_SECONDS) - - calc_days (1900, 1, 1) + 1); + calc_days (1900, 1, 1)); return v; }