diff options
| author | Oliver Bolte <obo@openoffice.org> | 2003-09-04 07:23:13 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2003-09-04 07:23:13 +0000 |
| commit | 1d987a37a698f8372dbd329a5f206c75f8188260 (patch) | |
| tree | 5580575fe38fd46b0382d372c0880d61aa580114 /connectivity | |
| parent | 03bf01d8d5eedb5ec67d1e854cbf4d6283fb70a2 (diff) | |
INTEGRATION: CWS oj4 (1.8.80); FILE MERGED
2003/08/22 13:12:19 oj 1.8.80.1: #i16265# fixes in column types on numeric calcs
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/commontools/DateConversion.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx index 4791de3e0941..7fdcae5ad32c 100644 --- a/connectivity/source/commontools/DateConversion.cxx +++ b/connectivity/source/commontools/DateConversion.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DateConversion.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: oj $ $Date: 2002-12-04 11:22:41 $ + * last change: $Author: obo $ $Date: 2003-09-04 08:23:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -363,7 +363,6 @@ double DBTypeConversion::getValue(const Reference<XColumn>& xVariant, return ::rtl::OUString(); sal_Int32 nKey; - sal_Int16 nKeyType; try { _xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FORMATKEY)) >>= nKey; @@ -381,9 +380,10 @@ double DBTypeConversion::getValue(const Reference<XColumn>& xVariant, Reference< XNumberFormatTypes > (xFormats, UNO_QUERY), _rLocale); - nKeyType = getNumberFormatType(_xFormatter, nKey) & ~NumberFormat::DEFINED; } + sal_Int16 nKeyType = getNumberFormatType(_xFormatter, nKey) & ~NumberFormat::DEFINED; + return DBTypeConversion::getValue(Reference< XColumn > (_xColumn, UNO_QUERY), _xFormatter, _rNullDate, nKey, nKeyType); } |