diff options
Diffstat (limited to 'connectivity/source/drivers/calc/CDatabaseMetaData.cxx')
| -rw-r--r-- | connectivity/source/drivers/calc/CDatabaseMetaData.cxx | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx index 5dd895b6f5c7..942545719e5d 100644 --- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx +++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx @@ -2,9 +2,9 @@ * * $RCSfile: CDatabaseMetaData.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: oj $ $Date: 2001-03-28 11:32:42 $ + * last change: $Author: oj $ $Date: 2001-05-14 11:40:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -117,10 +117,6 @@ #ifndef _COMPHELPER_TYPES_HXX_ #include <comphelper/types.hxx> #endif -#define CONNECTIVITY_PROPERTY_NAME_SPACE calc -#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_ -#include "propertyids.hxx" -#endif using namespace connectivity::calc; using namespace connectivity::file; @@ -289,16 +285,16 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns( xColumns->getByName(*pBegin) >>= xColumn; OSL_ENSURE(xColumn.is(),"Columns contains a column who isn't a fastpropertyset!"); - aRow[5] = ::comphelper::getINT32(xColumn->getPropertyValue(PROPERTY_TYPE)); - aRow[6] = ::comphelper::getString(xColumn->getPropertyValue(PROPERTY_TYPENAME)); - aRow[7] = ::comphelper::getINT32(xColumn->getPropertyValue(PROPERTY_PRECISION)); - // aRow[8] = xColumn->getPropertyValue(PROPERTY_TYPENAME); - aRow[9] = ::comphelper::getINT32(xColumn->getPropertyValue(PROPERTY_SCALE)); - aRow[11] = ::comphelper::getINT32(xColumn->getPropertyValue(PROPERTY_ISNULLABLE)); - // aRow[12] = xColumn->getPropertyValue(PROPERTY_TYPENAME); - aRow[13] = ::comphelper::getString(xColumn->getPropertyValue(PROPERTY_DEFAULTVALUE)); - // aRow[14] = xColumn->getPropertyValue(PROPERTY_TYPENAME); - // aRow[15] = xColumn->getPropertyValue(PROPERTY_TYPENAME); + aRow[5] = ::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))); + aRow[6] = ::comphelper::getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))); + aRow[7] = ::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))); + // aRow[8] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)); + aRow[9] = ::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))); + aRow[11] = ::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))); + // aRow[12] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)); + aRow[13] = ::comphelper::getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE))); + // aRow[14] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)); + // aRow[15] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)); switch(sal_Int32(aRow[5])) { case DataType::CHAR: |