diff options
Diffstat (limited to 'connectivity')
24 files changed, 42 insertions, 36 deletions
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst index 20cb27644e29..87e1791ba72e 100644 --- a/connectivity/prj/build.lst +++ b/connectivity/prj/build.lst @@ -1,4 +1,4 @@ -cn connectivity : l10n comphelper MOZ:moz SO:moz_prebuilt svtools UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss NULL +cn connectivity : shell l10n comphelper MOZ:moz SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss NULL cn connectivity usr1 - all cn_mkout NULL cn connectivity\inc nmake - all cn_inc NULL cn connectivity\com\sun\star\sdbcx\comp\hsqldb nmake - all cn_jhsqldbdb cn_hsqldb cn_inc NULL diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index b3254a0165a8..f434d775f87c 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -1989,7 +1989,7 @@ namespace detail virtual Reference< XBlob > getBlob() const { return m_xColumn->getBlob(); }; virtual Reference< XClob > getClob() const { return m_xColumn->getClob(); }; virtual Any getObject() const { return m_xColumn->getObject( NULL ); }; - virtual sal_Bool wasNull() const { return m_xColumn->wasNull(); }; + virtual sal_Bool wasNull() const { return m_xColumn->wasNull( ); }; private: const Reference< XColumn > m_xColumn; diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx index 76519aa6a551..e1b49c878ba9 100644 --- a/connectivity/source/commontools/formattedcolumnvalue.cxx +++ b/connectivity/source/commontools/formattedcolumnvalue.cxx @@ -44,7 +44,7 @@ #include <com/sun/star/sdbc/DataType.hpp> /** === end UNO includes === **/ -#include <svtools/syslocale.hxx> +//#include <unotools/syslocale.hxx> #include <tools/diagnose_ex.h> diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx index 77467dda0bc3..cfcd8b83761b 100644 --- a/connectivity/source/drivers/calc/CConnection.cxx +++ b/connectivity/source/drivers/calc/CConnection.cxx @@ -46,7 +46,7 @@ #include <tools/urlobj.hxx> #include "calc/CPreparedStatement.hxx" #include "calc/CStatement.hxx" -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <connectivity/dbexception.hxx> #include <cppuhelper/exc_hlp.hxx> #include <rtl/logfile.hxx> diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index 91f917224496..ba6d20ac70f5 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -50,7 +50,7 @@ #include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/text/XText.hpp> -#include <svtools/converter.hxx> +#include <svl/converter.hxx> #include "calc/CConnection.hxx" #include "calc/CColumns.hxx" #include "connectivity/sdbcx/VColumn.hxx" @@ -58,7 +58,7 @@ #include <osl/thread.h> #include <tools/config.hxx> #include <comphelper/sequence.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <rtl/math.hxx> #include <comphelper/extract.hxx> #include <connectivity/dbexception.hxx> diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk index 620bcd6a8eee..f4019564ed30 100644 --- a/connectivity/source/drivers/calc/makefile.mk +++ b/connectivity/source/drivers/calc/makefile.mk @@ -73,6 +73,7 @@ SHL1STDLIBS=\ $(VOSLIB) \ $(SVLLIB) \ $(TOOLSLIB) \ + $(UNOTOOLSLIB) \ $(SALLIB) \ $(DBTOOLSLIB) \ $(DBFILELIB) \ diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 1db81262e120..e93671441969 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -35,7 +35,7 @@ #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> #include <com/sun/star/sdbc/XRow.hpp> -#include <svtools/converter.hxx> +#include <svl/converter.hxx> #include "dbase/DConnection.hxx" #include "dbase/DColumns.hxx" #include <osl/thread.h> @@ -44,8 +44,8 @@ #include "dbase/DIndexes.hxx" //#include "file/FDriver.hxx" #include <comphelper/sequence.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/syslocale.hxx> +#include <svl/zforlist.hxx> +#include <unotools/syslocale.hxx> #include <rtl/math.hxx> #include <stdio.h> //sprintf #include <ucbhelper/content.hxx> diff --git a/connectivity/source/drivers/evoab/LFolderList.cxx b/connectivity/source/drivers/evoab/LFolderList.cxx index a3c031c05c05..5f71303d7e28 100644 --- a/connectivity/source/drivers/evoab/LFolderList.cxx +++ b/connectivity/source/drivers/evoab/LFolderList.cxx @@ -36,13 +36,13 @@ #include "LFolderList.hxx" #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/DataType.hpp> -#include <svtools/converter.hxx> +#include <svl/converter.hxx> #include "LConnection.hxx" #include "LColumns.hxx" #include <osl/thread.h> #include <tools/config.hxx> #include <comphelper/sequence.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <rtl/math.hxx> #include <stdio.h> //sprintf #include <comphelper/extract.hxx> @@ -59,7 +59,7 @@ #ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX #include "LDebug.hxx" #endif -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> using namespace ::comphelper; using namespace connectivity; diff --git a/connectivity/source/drivers/evoab/LTable.cxx b/connectivity/source/drivers/evoab/LTable.cxx index cbb4bc53e9f4..3d72e1a3946f 100644 --- a/connectivity/source/drivers/evoab/LTable.cxx +++ b/connectivity/source/drivers/evoab/LTable.cxx @@ -39,13 +39,13 @@ #ifndef _COM_SUN_STAR_SQLC_XROW_HPP_ //#include <com/sun/star/sdbc/XRow.hpp> #endif -#include <svtools/converter.hxx> +#include <svl/converter.hxx> #include "LConnection.hxx" #include "LColumns.hxx" #include <osl/thread.h> #include <tools/config.hxx> #include <comphelper/sequence.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <rtl/math.hxx> #include <stdio.h> //sprintf #include <comphelper/extract.hxx> @@ -56,7 +56,7 @@ #include <i18npool/mslangid.hxx> #include "connectivity/dbconversion.hxx" #include <comphelper/types.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX #include "LDebug.hxx" #endif diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index d71908e0afd8..c8cda89b503c 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -54,7 +54,7 @@ #include <cppuhelper/typeprovider.hxx> #include <rtl/string.hxx> #include <tools/diagnose_ex.h> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <unotools/intlwrapper.hxx> #include <cstring> diff --git a/connectivity/source/drivers/evoab2/makefile.mk b/connectivity/source/drivers/evoab2/makefile.mk index e9bb9fdc4d70..6d7ca92fbdd6 100644 --- a/connectivity/source/drivers/evoab2/makefile.mk +++ b/connectivity/source/drivers/evoab2/makefile.mk @@ -77,9 +77,7 @@ SHL1STDLIBS=\ $(CPPUHELPERLIB) \ $(VOSLIB) \ $(SVLLIB) \ - $(VCLLIB) \ $(TOOLSLIB) \ - $(SVTOOLLIB) \ $(UNOTOOLSLIB) \ $(UCBHELPERLIB) \ $(SALLIB) \ diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx index 52d14e6498cb..caa117037bcf 100644 --- a/connectivity/source/drivers/file/FConnection.cxx +++ b/connectivity/source/drivers/file/FConnection.cxx @@ -44,7 +44,7 @@ #include <com/sun/star/ucb/XContentIdentifier.hpp> #include <tools/urlobj.hxx> #include "file/FCatalog.hxx" -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <ucbhelper/content.hxx> #include <connectivity/dbcharset.hxx> #include <connectivity/dbexception.hxx> diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx index 4b2865a67aa2..5f967758c125 100644 --- a/connectivity/source/drivers/file/fcode.cxx +++ b/connectivity/source/drivers/file/fcode.cxx @@ -34,8 +34,8 @@ #include <osl/diagnose.h> #include "connectivity/sqlparse.hxx" #include <i18npool/mslangid.hxx> -#include <vcl/svapp.hxx> #include <tools/debug.hxx> +#include <tools/string.hxx> #include "TConnection.hxx" #include <com/sun/star/sdb/SQLFilterOperator.hpp> #include <comphelper/types.hxx> diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index fa4f281ea794..149925d06451 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -36,13 +36,13 @@ #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> -#include <svtools/converter.hxx> +#include <svl/converter.hxx> #include "flat/EConnection.hxx" #include "flat/EColumns.hxx" #include <osl/thread.h> #include <tools/config.hxx> #include <comphelper/sequence.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <rtl/math.hxx> #include <stdio.h> //sprintf #include <comphelper/extract.hxx> @@ -54,7 +54,7 @@ #include "connectivity/dbconversion.hxx" #include <comphelper/types.hxx> #include "file/quotedstring.hxx" -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <rtl/logfile.hxx> using namespace ::comphelper; diff --git a/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk index d044eab2796a..071c8c0cc976 100644 --- a/connectivity/source/drivers/flat/makefile.mk +++ b/connectivity/source/drivers/flat/makefile.mk @@ -84,7 +84,7 @@ SHL1STDLIBS=\ $(CPPUHELPERLIB) \ $(VOSLIB) \ $(TOOLSLIB) \ - $(SVTOOLLIB) \ + $(SVLLIB) \ $(UNOTOOLSLIB) \ $(SALLIB) \ $(DBTOOLSLIB) \ diff --git a/connectivity/source/drivers/kab/KConnection.cxx b/connectivity/source/drivers/kab/KConnection.cxx index 1df3315f559d..356d43822be4 100644 --- a/connectivity/source/drivers/kab/KConnection.cxx +++ b/connectivity/source/drivers/kab/KConnection.cxx @@ -39,7 +39,7 @@ #include "KCatalog.hxx" #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/TransactionIsolation.hpp> -#include <vcl/kde_headers.h> +#include <shell/kde_headers.h> using namespace connectivity::kab; using namespace com::sun::star::uno; diff --git a/connectivity/source/drivers/kab/KDEInit.cxx b/connectivity/source/drivers/kab/KDEInit.cxx index 3e7c69166b1b..2736cb5c6fbc 100644 --- a/connectivity/source/drivers/kab/KDEInit.cxx +++ b/connectivity/source/drivers/kab/KDEInit.cxx @@ -33,7 +33,7 @@ #include "KDEInit.h" #include <osl/diagnose.h> #include <osl/process.h> -#include <vcl/kde_headers.h> +#include <shell/kde_headers.h> namespace connectivity { diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx index c210b52ec4bc..127c70cb4207 100644 --- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx +++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx @@ -34,7 +34,7 @@ #include "KDatabaseMetaData.hxx" #include "kfields.hxx" #include "KDEInit.h" -#include <vcl/kde_headers.h> +#include <shell/kde_headers.h> #include "FDatabaseMetaDataResultSet.hxx" #include "OTypeInfo.hxx" #include <com/sun/star/sdbc/ColumnValue.hpp> diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx index 72b1e618be28..51321b106042 100644 --- a/connectivity/source/drivers/kab/KResultSet.hxx +++ b/connectivity/source/drivers/kab/KResultSet.hxx @@ -33,7 +33,7 @@ #include "KStatement.hxx" #include "KResultSetMetaData.hxx" -#include <vcl/kde_headers.h> +#include <shell/kde_headers.h> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> #include <com/sun/star/sdbc/XColumnLocate.hpp> diff --git a/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx index bb219fcf443b..0621eef7fb8b 100644 --- a/connectivity/source/drivers/kab/kcondition.hxx +++ b/connectivity/source/drivers/kab/kcondition.hxx @@ -34,7 +34,7 @@ #ifndef _COMPHELPER_TYPES_H_ #include <comphelper/types.hxx> #endif -#include <vcl/kde_headers.h> +#include <shell/kde_headers.h> #include <connectivity/dbexception.hxx> namespace connectivity diff --git a/connectivity/source/drivers/kab/kfields.hxx b/connectivity/source/drivers/kab/kfields.hxx index d6f8622398b4..e73660ad7858 100644 --- a/connectivity/source/drivers/kab/kfields.hxx +++ b/connectivity/source/drivers/kab/kfields.hxx @@ -31,7 +31,7 @@ #ifndef _CONNECTIVITY_KAB_FIELDS_HXX_ #define _CONNECTIVITY_KAB_FIELDS_HXX_ -#include <vcl/kde_headers.h> +#include <shell/kde_headers.h> #include <connectivity/dbexception.hxx> #include <rtl/ustring.hxx> diff --git a/connectivity/source/drivers/kab/korder.hxx b/connectivity/source/drivers/kab/korder.hxx index 41a280050c06..dd93066074bf 100644 --- a/connectivity/source/drivers/kab/korder.hxx +++ b/connectivity/source/drivers/kab/korder.hxx @@ -32,7 +32,7 @@ #define _CONNECTIVITY_KAB_ORDER_HXX_ #include "rtl/ustring.hxx" -#include <vcl/kde_headers.h> +#include <shell/kde_headers.h> #include <vector> diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx index 77ecceeaacdf..d084561f9372 100644 --- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx @@ -283,7 +283,7 @@ Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 co aDate.day = 0; aDate.month = 0; aDate.year = 0; - OTools::getValue(m_pConnection,m_aStatementHandle,columnIndex,SQL_C_DATE,m_bWasNull,**this,&aDate,sizeof aDate); + OTools::getValue(m_pConnection,m_aStatementHandle,columnIndex,m_pConnection->useOldDateFormat() ? SQL_C_DATE : SQL_C_TYPE_DATE,m_bWasNull,**this,&aDate,sizeof aDate); return Date(aDate.day,aDate.month,aDate.year); } else @@ -434,7 +434,7 @@ sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) columnIndex = mapColumn(columnIndex); ::rtl::OUString aVal; if(columnIndex <= m_nDriverColumnCount) - aVal = OTools::getStringValue(m_pConnection,m_aStatementHandle,columnIndex,(SWORD)SQL_C_WCHAR,m_bWasNull,**this,m_nTextEncoding); + aVal = OTools::getStringValue(m_pConnection,m_aStatementHandle,columnIndex,impl_getColumnType_nothrow(columnIndex),m_bWasNull,**this,m_nTextEncoding); else m_bWasNull = sal_True; @@ -454,7 +454,7 @@ sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) columnIndex = mapColumn(columnIndex); TIME_STRUCT aTime={0,0,0}; if(columnIndex <= m_nDriverColumnCount) - OTools::getValue(m_pConnection,m_aStatementHandle,columnIndex,SQL_C_TIME,m_bWasNull,**this,&aTime,sizeof aTime); + OTools::getValue(m_pConnection,m_aStatementHandle,columnIndex,m_pConnection->useOldDateFormat() ? SQL_C_TIME : SQL_C_TYPE_TIME,m_bWasNull,**this,&aTime,sizeof aTime); else m_bWasNull = sal_True; return Time(0,aTime.second,aTime.minute,aTime.hour); @@ -472,7 +472,7 @@ sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) columnIndex = mapColumn(columnIndex); TIMESTAMP_STRUCT aTime={0,0,0,0,0,0,0}; if(columnIndex <= m_nDriverColumnCount) - OTools::getValue(m_pConnection,m_aStatementHandle,columnIndex,SQL_C_TIMESTAMP,m_bWasNull,**this,&aTime,sizeof aTime); + 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); @@ -1316,5 +1316,11 @@ void ODatabaseMetaDataResultSet::checkColumnCount() } // ----------------------------------------------------------------------------- - +SWORD ODatabaseMetaDataResultSet::impl_getColumnType_nothrow(sal_Int32 columnIndex) +{ + ::std::map<sal_Int32,SWORD>::iterator aFind = m_aODBCColumnTypes.find(columnIndex); + if ( aFind == m_aODBCColumnTypes.end() ) + aFind = m_aODBCColumnTypes.insert(::std::map<sal_Int32,SWORD>::value_type(columnIndex,OResultSetMetaData::getColumnODBCType(m_pConnection,m_aStatementHandle,*this,columnIndex))).first; + return aFind->second; +} diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx index 6248417828ba..46b5a020d1d0 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx @@ -100,6 +100,7 @@ namespace connectivity sal_Int32 getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); ::rtl::OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + SWORD impl_getColumnType_nothrow(sal_Int32 column); sal_Int32 mapColumn (sal_Int32 column); |