diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-10-05 12:01:10 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-10-05 12:01:10 +0100 |
commit | 9bb187006a42ee8b0dcb6fe47407752c7873f41b (patch) | |
tree | 74c6ef9ed1ad1228327de10e3a63e929723e038a | |
parent | d82d203195cea5137a123ea8fc45988d3fca741c (diff) |
Resolves: fdo#34309 odbc fractional seconds are in billionths
-rw-r--r-- | connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/odbcbase/OResultSet.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx index 6df4f2c0275a..b1983106b9e2 100644 --- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx @@ -471,7 +471,7 @@ sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) OTools::getValue(m_pConnection,m_aStatementHandle,columnIndex,m_pConnection->useOldDateFormat() ? SQL_C_TIMESTAMP : SQL_C_TYPE_TIMESTAMP,m_bWasNull,**this,&aTime,sizeof aTime); else m_bWasNull = sal_True; - return DateTime((sal_uInt16)aTime.fraction*1000,aTime.second,aTime.minute,aTime.hour,aTime.day,aTime.month,aTime.year); + return DateTime((sal_uInt16)aTime.fraction/ODBC_FRACTION_UNITS_PER_HSECOND,aTime.second,aTime.minute,aTime.hour,aTime.day,aTime.month,aTime.year); } // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx b/connectivity/source/drivers/odbcbase/OResultSet.cxx index 3c13671d22cb..219db7dd01c8 100644 --- a/connectivity/source/drivers/odbcbase/OResultSet.cxx +++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx @@ -653,7 +653,7 @@ DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLExc &aTime,sizeof aTime); return (&aValue == &m_aEmptyValue) ? - DateTime(static_cast<sal_uInt16>(aTime.fraction*1000),aTime.second,aTime.minute,aTime.hour,aTime.day,aTime.month,aTime.year) + DateTime(static_cast<sal_uInt16>(aTime.fraction/ODBC_FRACTION_UNITS_PER_HSECOND),aTime.second,aTime.minute,aTime.hour,aTime.day,aTime.month,aTime.year) : (DateTime)aValue; } |