summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWastack <btomi96@gmail.com>2016-07-11 17:25:58 +0200
committerEike Rathke <erack@redhat.com>2016-07-15 18:24:57 +0000
commitdc0a20cc9b7781b821778d69d2be75e60621e5bc (patch)
treeafd66e275761003ff9aa96a608ebf9b3e2b9716c
parent21770181089cdd4c42c5ef810c49439e7daede30 (diff)
tdf#91324 GSoC adapt struct tm correctly
Change-Id: I645ebe888186e550b95dd072e063260bc69aa178 Reviewed-on: https://gerrit.libreoffice.org/27120 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu> (cherry picked from commit 88346f606a16865bcf7492f67a7207d0078787a1) Reviewed-on: https://gerrit.libreoffice.org/27234 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
-rw-r--r--connectivity/source/drivers/firebird/ResultSet.cxx12
1 files changed, 8 insertions, 4 deletions
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx
index acfeb8b2998c..ca35c5185cbe 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -480,10 +480,14 @@ DateTime OResultSet::retrieveValue(const sal_Int32 nColumnIndex, const ISC_SHORT
struct tm aCTime;
isc_decode_timestamp(&aISCTimestamp, &aCTime);
- // first field is nanoseconds -- not supported in firebird or struct tm.
- // last field denotes UTC (true) or unknown (false)
- return DateTime(0, aCTime.tm_sec, aCTime.tm_min, aCTime.tm_hour, aCTime.tm_mday,
- aCTime.tm_mon, aCTime.tm_year, false);
+ return DateTime(0, //nanoseconds, not supported
+ aCTime.tm_sec,
+ aCTime.tm_min,
+ aCTime.tm_hour,
+ aCTime.tm_mday,
+ aCTime.tm_mon + 1, // tm is from 0 to 11
+ aCTime.tm_year + 1900, //tm_year is the years since 1900
+ false); // denotes UTC (true), or unknown (false)
}
else
{