diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-03-02 11:33:36 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-03-02 11:33:36 +0000 |
| commit | e9c61ed3c4cf6e4187f3cc5d8d704ec053eb559f (patch) | |
| tree | cd73cd355fa81f2bb2d3f0179a1e9b15f704db5f /connectivity/source/drivers/ado/adoimp.cxx | |
| parent | fb0768f3e90f405619ec62990c47b631ea3f72c8 (diff) | |
INTEGRATION: CWS oj07 (1.11.116); FILE MERGED
2003/08/22 09:21:01 oj 1.11.116.1: #109720# typehandling for ado adjusted
Diffstat (limited to 'connectivity/source/drivers/ado/adoimp.cxx')
| -rw-r--r-- | connectivity/source/drivers/ado/adoimp.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx index 949cde6bc326..197bd5fa6c36 100644 --- a/connectivity/source/drivers/ado/adoimp.cxx +++ b/connectivity/source/drivers/ado/adoimp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: adoimp.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: fs $ $Date: 2002-01-18 16:33:01 $ + * last change: $Author: rt $ $Date: 2004-03-02 12:33:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -155,8 +155,8 @@ sal_Int32 ADOS::MapADOType2Jdbc(DataTypeEnum eType) case adDBTimeStamp: nType = DataType::TIMESTAMP; break; case adBoolean: nType = DataType::BIT; break; // case adArray: nType = DataType::ARRAY; break; - case adBinary: - case adGUID: nType = DataType::BINARY; break; + case adBinary: nType = DataType::BINARY; break; + case adGUID: nType = DataType::OBJECT; break; case adBSTR: case adVarWChar: case adWChar: @@ -207,8 +207,9 @@ DataTypeEnum ADOS::MapJdbc2ADOType(sal_Int32 _nType,sal_Int32 _nJetEngine) case DataType::LONGVARBINARY: return adLongVarBinary; break; case DataType::CHAR: return adWChar; break; case DataType::TINYINT: return isJetEngine(_nJetEngine) ? adUnsignedTinyInt : adTinyInt;break; + case DataType::OBJECT: return adGUID; break; default: - OSL_ENSURE(0,"MapADOType2Jdbc: Unknown Type!"); + OSL_ENSURE(0,"MapJdbc2ADOType: Unknown Type!"); ; } return adEmpty; |