replace obsolete "master" branch with README that points at new repoHEADmaster-deletedmaster

14 files changed, 0 insertions, 2968 deletions

diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx
deleted file mode 100644
index 5817aac107..0000000000
--- a/connectivity/source/inc/odbc/OBoundParam.hxx
+++ /dev/null
@@ -1,224 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _CONNECTIVITY_OBOUNPARAM_HXX_
-#define _CONNECTIVITY_OBOUNPARAM_HXX_
-
-#include <com/sun/star/io/XInputStream.hpp>
-#include "odbc/odbcbasedllapi.hxx"
-
-namespace connectivity
-{
-    namespace odbc
-    {
-        class OOO_DLLPUBLIC_ODBCBASE OBoundParam
-        {
-
-        public:
-            OBoundParam()
-            {
-                paramLength = NULL;
-                binaryData	= NULL;
-                pA1=0;
-                pA2=0;
-                pB1=0;
-                pB2=0;
-                pC1=0;
-                pC2=0;
-                pS1=0;
-                pS2=0;
-            }
-            ~OBoundParam()
-            {
-                delete [] binaryData;
-                delete [] paramLength;
-            }
-            //--------------------------------------------------------------------
-            // initialize
-            // Perform an necessary initialization
-            //--------------------------------------------------------------------
-            void initialize ()
-            {
-                // Allocate storage for the length.  Note - the length is
-                // stored in native format, and will have to be converted
-                // to a Java sal_Int32.  The jdbcodbc 'C' bridge provides an
-                // interface to do this.
-
-                paramLength = new sal_Int8[4];
-            }
-
-            //--------------------------------------------------------------------
-            // allocBindDataBuffer
-            // Allocates and returns a new bind data buffer of the specified
-            // length
-            //--------------------------------------------------------------------
-            sal_Int8* allocBindDataBuffer (sal_Int32 bufLen)
-            {
-                if ( binaryData )
-                    delete [] binaryData;
-                binaryData = new sal_Int8[bufLen];
-
-                // Reset the input stream, we are doing a new bind
-                setInputStream (NULL, 0);
-
-                return binaryData;
-            }
-
-            //--------------------------------------------------------------------
-            // getBindDataBuffer
-            // Returns the data buffer to be used when binding to a parameter
-            //--------------------------------------------------------------------
-            sal_Int8* getBindDataBuffer ()
-            {
-                return binaryData;
-            }
-
-            //--------------------------------------------------------------------
-            // getBindLengthBuffer
-            // Returns the length buffer to be used when binding to a parameter
-            //--------------------------------------------------------------------
-            sal_Int8* getBindLengthBuffer ()
-            {
-                return paramLength;
-            }
-
-            //--------------------------------------------------------------------
-            // setInputStream
-            // Sets the input stream for the bound parameter
-            //--------------------------------------------------------------------
-            void setInputStream(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& inputStream,
-                                sal_Int32 len)
-            {
-                paramInputStream = inputStream;
-                paramInputStreamLen = len;
-            }
-
-            void setSequence(const ::com::sun::star::uno::Sequence< sal_Int8 >& _aSequence)
-            {
-                aSequence = _aSequence;
-            }
-
-            //--------------------------------------------------------------------
-            // getInputStream
-            // Gets the input stream for the bound parameter
-            //--------------------------------------------------------------------
-            ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> getInputStream ()
-            {
-                return paramInputStream;
-            }
-
-            //--------------------------------------------------------------------
-            // getInputStreamLen
-            // Gets the input stream length for the bound parameter
-            //--------------------------------------------------------------------
-            sal_Int32 getInputStreamLen ()
-            {
-                return paramInputStreamLen;
-            }
-
-            //--------------------------------------------------------------------
-            // setSqlType
-            // Sets the Java sql type used to register an OUT parameter
-            //--------------------------------------------------------------------
-
-            void setSqlType(sal_Int32 type)
-            {
-                sqlType = type;
-            }
-
-            //--------------------------------------------------------------------
-            // getSqlType
-            // Gets the Java sql type used to register an OUT parameter
-            //--------------------------------------------------------------------
-
-            sal_Int32 getSqlType ()
-            {
-                return sqlType;
-            }
-
-            //--------------------------------------------------------------------
-            // setOutputParameter
-            // Sets the flag indicating if this is an OUTPUT parameter
-            //--------------------------------------------------------------------
-
-            void setOutputParameter (sal_Bool output)
-            {
-                outputParameter = output;
-            }
-
-            //--------------------------------------------------------------------
-            // isOutputParameter
-            // Gets the OUTPUT parameter flag
-            //--------------------------------------------------------------------
-
-            sal_Bool isOutputParameter ()
-            {
-                return outputParameter;
-            }
-
-        protected:
-            //====================================================================
-            // Data attributes
-            //====================================================================
-
-            sal_Int8* binaryData;		// Storage area to be used
-                                        // when binding the parameter
-
-            sal_Int8* paramLength;		// Storage area to be used
-                                        // for the bound length of the
-                                        // parameter.  Note that this
-                                        // data is in native format.
-
-            ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> paramInputStream;
-            ::com::sun::star::uno::Sequence< sal_Int8 > aSequence;
-                                        // When an input stream is
-                                        // bound to a parameter, the
-                                        // input stream is saved
-                                        // until needed.
-
-            sal_Int32 paramInputStreamLen;	              // Length of input stream
-
-            sal_Int32 sqlType;                          // Java SQL type used to
-                                                            // register an OUT parameter
-
-            sal_Bool outputParameter;	// true for OUTPUT parameters
-
-
-            sal_Int32 pA1;              //pointers
-            sal_Int32 pA2;
-            sal_Int32 pB1;
-            sal_Int32 pB2;
-            sal_Int32 pC1;
-            sal_Int32 pC2;
-            sal_Int32 pS1;
-            sal_Int32 pS2;// reserved for strings(UTFChars)
-        };
-    }
-}
-#endif // _CONNECTIVITY_OBOUNPARAM_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx
deleted file mode 100644
index 4b6f6b1081..0000000000
--- a/connectivity/source/inc/odbc/OConnection.hxx
+++ /dev/null
@@ -1,162 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _CONNECTIVITY_ODBC_OCONNECTION_HXX_
-#define _CONNECTIVITY_ODBC_OCONNECTION_HXX_
-
-#include <com/sun/star/sdbc/SQLWarning.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include "odbc/OFunctiondefs.hxx"
-#include "odbc/odbcbasedllapi.hxx"
-#include "OSubComponent.hxx"
-#include "connectivity/CommonTools.hxx"
-#include "TConnection.hxx"
-#include "OTypeInfo.hxx"
-#include <cppuhelper/weakref.hxx>
-#include "AutoRetrievingBase.hxx"
-#include <osl/module.h>
-
-
-#include <map>
-
-namespace connectivity
-{
-    namespace odbc
-    {
-
-        class OStatement_Base;
-        class ODBCDriver;
-        class ODatabaseMetaData;
-
-        typedef connectivity::OMetaConnection OConnection_BASE;
-        typedef ::std::vector< ::connectivity::OTypeInfo>	TTypeInfoVector;
-
-        class OOO_DLLPUBLIC_ODBCBASE OConnection :
-                            public OConnection_BASE,
-                            public connectivity::OSubComponent<OConnection, OConnection_BASE>,
-                            public OAutoRetrievingBase
-        {
-            friend class connectivity::OSubComponent<OConnection, OConnection_BASE>;
-
-        protected:
-            //====================================================================
-            // Data attributes
-            //====================================================================
-            ::std::map< SQLHANDLE,OConnection*>	m_aConnections;	// holds all connectionas which are need for serveral statements
-            TTypeInfoVector						m_aTypeInfo;	//	vector containing an entry
-                                                        //  for each row returned by
-                                                        //  DatabaseMetaData.getTypeInfo.
-            
-
-            ::com::sun::star::sdbc::SQLWarning  m_aLastWarning; //      Last SQLWarning generated by
-                                                        //  an operation
-            ::rtl::OUString	m_sUser;		// the user name
-            ODBCDriver*		m_pDriver;		//	Pointer to the owning
-                                            //  driver object
-                            
-            SQLHANDLE		m_aConnectionHandle;
-            SQLHANDLE		m_pDriverHandleCopy;	// performance reason
-            sal_Int32		m_nStatementCount;
-            sal_Bool		m_bClosed;
-            sal_Bool		m_bUseCatalog;	// should we use the catalog on filebased databases
-            sal_Bool		m_bUseOldDateFormat;
-            sal_Bool		m_bParameterSubstitution;
-            sal_Bool		m_bIgnoreDriverPrivileges;
-            sal_Bool        m_bPreventGetVersionColumns;    // #i60273#
-            sal_Bool        m_bReadOnly;
-
-
-            SQLRETURN		OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int32 nTimeOut, sal_Bool bSilent);
-
-            virtual OConnection*	cloneConnection(); // creates a new connection
-            
-        public:
-            oslGenericFunction  getOdbcFunction(sal_Int32 _nIndex)  const;
-            virtual SQLRETURN       Construct( const ::rtl::OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException);
-
-            OConnection(const SQLHANDLE _pDriverHandle,ODBCDriver*	_pDriver);
-            //	OConnection(const SQLHANDLE _pConnectionHandle);
-            virtual ~OConnection();
-
-            void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException);
-
-            // OComponentHelper
-            virtual void SAL_CALL disposing(void);
-            // XInterface
-            virtual void SAL_CALL release() throw();
-
-            // XServiceInfo
-            DECLARE_SERVICE_INFO();
-            // XConnection
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL getAutoCommit(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL commit(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL rollback(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL isClosed(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL isReadOnly(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getCatalog(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setTypeMap( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            // XCloseable
-            virtual void SAL_CALL close(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            // XWarningsSupplier
-            virtual ::com::sun::star::uno::Any SAL_CALL getWarnings(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL clearWarnings(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            //
-            SQLHANDLE		getConnection() { return m_aConnectionHandle; }
-            
-            // should we use the catalog on filebased databases
-            inline sal_Bool		isCatalogUsed()						const { return m_bUseCatalog; }
-            inline sal_Bool		isParameterSubstitutionEnabled()	const { return m_bParameterSubstitution; }
-            inline sal_Bool		isIgnoreDriverPrivilegesEnabled()	const { return m_bIgnoreDriverPrivileges; }
-            inline sal_Bool     preventGetVersionColumns()          const { return m_bPreventGetVersionColumns; }
-            inline sal_Bool		useOldDateFormat()					const { return m_bUseOldDateFormat; }
-            inline SQLHANDLE		getDriverHandle()				const { return m_pDriverHandleCopy;}
-            inline ODBCDriver*		getDriver()						const { return m_pDriver;}
-            inline ::rtl::OUString getUserName()					const { return m_sUser; }
-
-            SQLHANDLE		createStatementHandle();
-            // close and free the handle and set it to SQL_NULLHANDLE
-            void			freeStatementHandle(SQLHANDLE& _pHandle);
-
-            void                    buildTypeInfo() throw( ::com::sun::star::sdbc::SQLException);
-            const TTypeInfoVector&	getTypeInfo() const { return m_aTypeInfo; }
-        };
-    }
-}
-#endif // _CONNECTIVITY_ODBC_OCONNECTION_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
deleted file mode 100644
index ab4eddfa53..0000000000
--- a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
+++ /dev/null
@@ -1,226 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _CONNECTIVITY_ODBC_ODATABASEMETADATA_HXX_
-#define _CONNECTIVITY_ODBC_ODATABASEMETADATA_HXX_
-
-#include "odbc/OConnection.hxx"
-#include "odbc/odbcbasedllapi.hxx"
-#include "TDatabaseMetaDataBase.hxx"
-
-namespace connectivity
-{
-    namespace odbc
-    {
-        //**************************************************************
-        //************ Class: ODatabaseMetaData
-        //**************************************************************
-
-        class OOO_DLLPUBLIC_ODBCBASE ODatabaseMetaData :
-            public ODatabaseMetaDataBase
-        {
-            SQLHANDLE		m_aConnectionHandle;
-            OConnection*	m_pConnection;
-            sal_Bool		m_bUseCatalog;
-            sal_Bool		m_bOdbc3;
-
-            // cached database information
-            virtual ::rtl::OUString impl_getIdentifierQuoteString_throw(  );
-            virtual sal_Bool        impl_isCatalogAtStart_throw(  );
-            virtual ::rtl::OUString impl_getCatalogSeparator_throw(  );
-            virtual sal_Bool        impl_supportsCatalogsInTableDefinitions_throw(  );
-            virtual sal_Bool        impl_supportsSchemasInTableDefinitions_throw(  ) ;
-            virtual sal_Bool        impl_supportsCatalogsInDataManipulation_throw(  );
-            virtual sal_Bool        impl_supportsSchemasInDataManipulation_throw(  ) ;
-            virtual sal_Bool        impl_supportsMixedCaseQuotedIdentifiers_throw(  ) ;
-            virtual sal_Bool        impl_supportsAlterTableWithAddColumn_throw(  );
-            virtual sal_Bool        impl_supportsAlterTableWithDropColumn_throw(  );
-            virtual sal_Int32       impl_getMaxStatements_throw(  );
-            virtual sal_Int32       impl_getMaxTablesInSelect_throw(  );
-            virtual sal_Bool        impl_storesMixedCaseQuotedIdentifiers_throw(  );
-        protected:
-            ::rtl::OUString getURLImpl();
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw();
-            virtual ~ODatabaseMetaData();
-        public:
-
-            inline OConnection* getOwnConnection() const { return m_pConnection; }
-            inline oslGenericFunction getOdbcFunction(sal_Int32 _nIndex)  const
-            {
-                return m_pConnection->getOdbcFunction(_nIndex);
-            }
-
-            ODatabaseMetaData(const SQLHANDLE _pHandle,OConnection* _pCon);
-            
-
-            
-            // XDatabaseMetaData
-            virtual sal_Bool SAL_CALL allProceduresAreCallable(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL allTablesAreSelectable(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getURL(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getUserName(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL isReadOnly(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL nullsAreSortedHigh(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL nullsAreSortedLow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL nullsAreSortedAtStart(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL nullsAreSortedAtEnd(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getDatabaseProductName(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getDriverName(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getDriverVersion(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getDriverMajorVersion(  ) throw(::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getDriverMinorVersion(  ) throw(::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL usesLocalFiles(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL usesLocalFilePerTable(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            
-            virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            
-            virtual ::rtl::OUString SAL_CALL getSQLKeywords(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getNumericFunctions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getStringFunctions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getSystemFunctions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getTimeDateFunctions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getSearchStringEscape(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getExtraNameCharacters(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsColumnAliasing(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL nullPlusNonNullIsNull(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsTypeConversion(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsTableCorrelationNames(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsOrderByUnrelated(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsGroupBy(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsGroupByUnrelated(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsLikeEscapeClause(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsMultipleResultSets(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsMultipleTransactions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsNonNullableColumns(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsCoreSQLGrammar(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsANSI92FullSQL(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsOuterJoins(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsFullOuterJoins(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsLimitedOuterJoins(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getSchemaTerm(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getProcedureTerm(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getCatalogTerm(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            
-            virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            
-            virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsPositionedDelete(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsPositionedUpdate(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsSelectForUpdate(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsStoredProcedures(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsSubqueriesInExists(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsSubqueriesInIns(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsUnion(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsUnionAll(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getMaxCharLiteralLength(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getMaxColumnNameLength(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getMaxColumnsInIndex(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getMaxColumnsInSelect(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getMaxColumnsInTable(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getMaxConnections(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getMaxCursorNameLength(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getMaxIndexLength(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getMaxSchemaNameLength(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getMaxProcedureNameLength(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getMaxCatalogNameLength(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getMaxRowSize(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getMaxStatementLength(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getMaxTableNameLength(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getMaxUserNameLength(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsTransactions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedures( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getSchemas(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCatalogs(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getVersionColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getImportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getExportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const ::rtl::OUString& primarySchema, const ::rtl::OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Bool unique, sal_Bool approximate ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsBatchUpdates(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-        };
-    }
-}
-#endif // _CONNECTIVITY_ODBC_ODATABASEMETADATA_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
deleted file mode 100644
index 8851f1f56e..0000000000
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ /dev/null
@@ -1,244 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _CONNECTIVITY_ODBC_ADATABASEMETADATARESULTSET_HXX_
-#define _CONNECTIVITY_ODBC_ADATABASEMETADATARESULTSET_HXX_
-
-#include <com/sun/star/sdbc/XResultSet.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-#include <com/sun/star/sdbc/XCloseable.hpp>
-#include <com/sun/star/sdbc/XColumnLocate.hpp>
-#include <com/sun/star/util/XCancellable.hpp>
-#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
-#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
-#include <com/sun/star/sdbc/XRowUpdate.hpp>
-#include <cppuhelper/compbase7.hxx>
-#include <comphelper/proparrhlp.hxx>
-#include "odbc/OStatement.hxx"
-#include "odbc/ODatabaseMetaData.hxx"
-#include "odbc/odbcbasedllapi.hxx"
-#include <comphelper/broadcasthelper.hxx>
-#include "connectivity/StdTypeDefs.hxx"
-
-namespace connectivity
-{
-    namespace odbc
-    {
-        class ODatabaseMetaDataResultSetMetaData;
-        /*
-        **	java_sql_ResultSet
-        */
-        typedef ::cppu::WeakComponentImplHelper7<	::com::sun::star::sdbc::XResultSet,
-                                                    ::com::sun::star::sdbc::XRow,
-                                                    ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
-                                                    ::com::sun::star::util::XCancellable,
-                                                    ::com::sun::star::sdbc::XWarningsSupplier,
-                                                    ::com::sun::star::sdbc::XCloseable,
-                                                    ::com::sun::star::sdbc::XColumnLocate> ODatabaseMetaDataResultSet_BASE;
-
-        class OOO_DLLPUBLIC_ODBCBASE ODatabaseMetaDataResultSet :
-                                    public comphelper::OBaseMutex,
-                                    public	ODatabaseMetaDataResultSet_BASE,
-                                    public	::cppu::OPropertySetHelper,
-                                    public	::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet>
-        {
-            ::connectivity::TIntVector						m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime
-
-            ::std::map<sal_Int32, ::connectivity::TInt2IntMap >					m_aValueRange;
-            ::std::map<sal_Int32, ::connectivity::TString2IntMap >				m_aStrValueRange;
-
-            ::std::map<sal_Int32, ::connectivity::TInt2StringMap >				m_aIntValueRange;
-            ::std::map<sal_Int32,SWORD>					                        m_aODBCColumnTypes;
-
-            SQLHANDLE																	m_aStatementHandle;
-            SQLHANDLE																	m_aConnectionHandle;
-            ::com::sun::star::uno::WeakReferenceHelper									m_aStatement;
-            ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData>        m_xMetaData;
-            SQLUSMALLINT*								m_pRowStatusArray;
-            OConnection*								m_pConnection;
-            rtl_TextEncoding							m_nTextEncoding;
-            sal_Int32									m_nRowPos;
-            sal_Int32									m_nLastColumnPos;		// used for m_aRow just to know where we are
-            sal_Int32									m_nDriverColumnCount;	// column count of the driver wich can sometimes be less than the metadata count
-            SQLRETURN									m_nCurrentFetchState;
-            sal_Bool									m_bWasNull;
-            sal_Bool									m_bEOF;					// after last record
-            sal_Bool									m_bFreeHandle;
-
-            // set the columncount of the driver
-            void checkColumnCount();
-            sal_Int32 getResultSetConcurrency() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            sal_Int32 getResultSetType()		const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            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 columnIndex);
-
-            sal_Int32 mapColumn (sal_Int32	column);
-
-        protected:
-
-            // OPropertyArrayUsageHelper
-            virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
-            // OPropertySetHelper
-            virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
-
-            virtual sal_Bool SAL_CALL convertFastPropertyValue(
-                                                                ::com::sun::star::uno::Any & rConvertedValue,
-                                                                ::com::sun::star::uno::Any & rOldValue,
-                                sal_Int32 nHandle,
-                                                                const ::com::sun::star::uno::Any& rValue )
-                                    throw (::com::sun::star::lang::IllegalArgumentException);
-            virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
-                                    sal_Int32 nHandle,
-                                                                        const ::com::sun::star::uno::Any& rValue
-                                                     )
-                                                                                                         throw (::com::sun::star::uno::Exception);
-            virtual void SAL_CALL getFastPropertyValue(
-                                                                        ::com::sun::star::uno::Any& rValue,
-                                    sal_Int32 nHandle
-                                         ) const;
-            ~ODatabaseMetaDataResultSet();
-        public:
-            // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
-            ODatabaseMetaDataResultSet(OConnection* _pConnection);
-
-
-            inline oslGenericFunction getOdbcFunction(sal_Int32 _nIndex)  const
-            {
-                return m_pConnection->getOdbcFunction(_nIndex);
-            }
-            // ::cppu::OComponentHelper
-            virtual void SAL_CALL disposing(void);
-            // XInterface
-            virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL acquire() throw();
-            virtual void SAL_CALL release() throw();
-            //XTypeProvider
-            virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
-            // XPropertySet
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
-            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *()
-            {
-                return ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(*(ODatabaseMetaDataResultSet_BASE*)this);
-            }
-            // XResultSet
-            virtual sal_Bool SAL_CALL next(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL isBeforeFirst(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL isAfterLast(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL isFirst(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL isLast(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL beforeFirst(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL afterLast(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL first(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL last(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL previous(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL refreshRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL rowUpdated(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL rowInserted(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL rowDeleted(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            // XRow
-            virtual sal_Bool SAL_CALL wasNull(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            // XResultSetMetaDataSupplier
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            // XCancellable
-            virtual void SAL_CALL cancel(  ) throw(::com::sun::star::uno::RuntimeException);
-            // XCloseable
-            virtual void SAL_CALL close(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            // XWarningsSupplier
-            virtual ::com::sun::star::uno::Any SAL_CALL getWarnings(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL clearWarnings(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            // XColumnLocate
-            virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-
-            const ::connectivity::TIntVector& getColumnMapping() { return m_aColMapping; }
-
-            void openTablesTypes( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            void openTypeInfo() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            void openCatalogs() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            void openSchemas() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            void openTables(const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern,
-                                            const ::rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types )
-                                            throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            void openColumnPrivileges(      const ::com::sun::star::uno::Any& catalog,    const ::rtl::OUString& schema,
-                                                                    const ::rtl::OUString& table,   const ::rtl::OUString& columnNamePattern )throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            void openColumns(       const ::com::sun::star::uno::Any& catalog,                            const ::rtl::OUString& schemaPattern,
-                                                    const ::rtl::OUString& tableNamePattern,        const ::rtl::OUString& columnNamePattern )throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            void openProcedureColumns(      const ::com::sun::star::uno::Any& catalog,            const ::rtl::OUString& schemaPattern,
-                                                            const ::rtl::OUString& procedureNamePattern,const ::rtl::OUString& columnNamePattern )throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            void openProcedures(    const ::com::sun::star::uno::Any& catalog,            const ::rtl::OUString& schemaPattern,
-                                                            const ::rtl::OUString& procedureNamePattern)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            void openVersionColumns(const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema,
-                                                            const ::rtl::OUString& table)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            void openBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema,
-                                                                    const ::rtl::OUString& table,sal_Int32 scope,sal_Bool nullable )throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            void openForeignKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString* schema,const ::rtl::OUString* table,
-                                                              const ::com::sun::star::uno::Any& catalog2, const ::rtl::OUString* schema2,const ::rtl::OUString* table2)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            void openExportedKeys(const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema,const ::rtl::OUString& table)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            void openImportedKeys(const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema,const ::rtl::OUString& table)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            void openPrimaryKeys(const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema,const ::rtl::OUString& table)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            void openTablePrivileges(const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern,
-                                                              const ::rtl::OUString& tableNamePattern)throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            void openSpecialColumns(sal_Bool _bRowVer,const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema,
-                                                                    const ::rtl::OUString& table,sal_Int32 scope,   sal_Bool nullable )throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            void openIndexInfo( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema,
-                                                    const ::rtl::OUString& table,sal_Bool unique,sal_Bool approximate )throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-
-        protected:
-            using OPropertySetHelper::getFastPropertyValue;
-        };
-    }
-
-}
-#endif // _CONNECTIVITY_ADO_ADATABASEMETADATARESULTSET_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/odbc/ODefs3.hxx b/connectivity/source/inc/odbc/ODefs3.hxx
deleted file mode 100644
index 29a56fe4c4..0000000000
--- a/connectivity/source/inc/odbc/ODefs3.hxx
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _CONNECTIVITY_ODBC_ODEFS_HXX_
-#define _CONNECTIVITY_ODBC_ODEFS_HXX_
-
-#define N3SQLAllocHandle SQLAllocHandle
-#define N3SQLConnect SQLConnect
-#define N3SQLDriverConnect SQLDriverConnect
-#define N3SQLBrowseConnect SQLBrowseConnect
-#define N3SQLDataSources SQLDataSources
-#define N3SQLDrivers SQLDrivers
-#define N3SQLGetInfo SQLGetInfo
-#define N3SQLGetFunctions SQLGetFunctions
-#define N3SQLGetTypeInfo SQLGetTypeInfo
-#define N3SQLSetConnectAttr SQLSetConnectAttr
-#define N3SQLGetConnectAttr SQLGetConnectAttr
-#define N3SQLSetEnvAttr SQLSetEnvAttr
-#define N3SQLGetEnvAttr SQLGetEnvAttr
-#define N3SQLSetStmtAttr SQLSetStmtAttr
-#define N3SQLGetStmtAttr SQLgetStmtAttr
-#define N3SQLSetDescField SQLSetDescField
-#define N3SQLGetDescField SQLGetDescField
-#define N3SQLGetDescRec SQLGetDescRec
-#define N3SQLSetDescRec SQLSetDescRec
-#define N3SQLPrepare SQLPrepare
-#define N3SQLBindParameter SQLBindParameter
-#define N3SQLGetCursorName SQLGetCursorName
-#define N3SQLSetCursorName SQLSetCursorName
-#define N3SQLExecute SQLExecute
-#define N3SQLExecDirect SQLExecDirect
-#define N3SQLNativeSql SQLNativeSql
-#define N3SQLDescribeParam SQLDescribeParam
-#define N3SQLNumParams SQLNumParams
-#define N3SQLParamData SQLParamData
-#define N3SQLPutData SQLPutData
-#define N3SQLRowCount SQLRowCount
-#define N3SQLNumResultCols SQLNumResultCols
-#define N3SQLDescribeCol SQLDescribeCol
-#define N3SQLColAttribute SQLColAttribute
-#define N3SQLBindCol SQLBindCol
-#define N3SQLFetch SQLFetch
-#define N3SQLFetchScroll SQLFetchScroll
-#define N3SQLGetData SQLGetData
-#define N3SQLSetPos SQLSetPos
-#define N3SQLBulkOperations SQLBulkOperations
-#define N3SQLMoreResults SQLMoreResults
-#define N3SQLGetDiagField SQLGetDiagField
-#define N3SQLGetDiagRec SQLGetDiagRec
-#define N3SQLColumnPrivileges SQLColumnPrivileges
-#define N3SQLColumns SQLColumns
-#define N3SQLForeignKeys SQLForeignKeys
-#define N3SQLPrimaryKeys SQLPrimaryKeys
-#define N3SQLProcedureColumns SQLProcedureColumns
-#define N3SQLProcedures SQLProcedures
-#define N3SQLSpecialColumns SQLSpecialColumns
-#define N3SQLStatistics SQLStatistics
-#define N3SQLTablePrivileges SQLTablePrivileges
-#define N3SQLTables SQLTables
-#define N3SQLFreeStmt SQLFreeStmt
-#define N3SQLCloseCursor SQLCloseCursor
-#define N3SQLCancel SQLCancel
-#define N3SQLEndTran SQLEndTran
-#define N3SQLDisconnect SQLDisconnect
-#define N3SQLFreeHandle SQLFreeHandle
-#define N3SQLGetCursorName SQLGetCursorName
-
-#endif // _CONNECTIVITY_ODBC_ODEFS_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/odbc/ODriver.hxx b/connectivity/source/inc/odbc/ODriver.hxx
deleted file mode 100644
index abdf594964..0000000000
--- a/connectivity/source/inc/odbc/ODriver.hxx
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _CONNECTIVITY_ODBC_ODRIVER_HXX_
-#define _CONNECTIVITY_ODBC_ODRIVER_HXX_
-
-#include <com/sun/star/sdbc/XDriver.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/compbase2.hxx>
-#include "odbc/OFunctiondefs.hxx"
-#include "odbc/odbcbasedllapi.hxx"
-#include "connectivity/CommonTools.hxx"
-#include <osl/module.h>
-
-namespace connectivity
-{
-    namespace odbc
-    {
-        typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XDriver, ::com::sun::star::lang::XServiceInfo > ODriver_BASE;
-
-        class OOO_DLLPUBLIC_ODBCBASE SAL_NO_VTABLE ODBCDriver : public ODriver_BASE
-        {
-        protected:
-            ::osl::Mutex							m_aMutex;
-
-            connectivity::OWeakRefArray				m_xConnections;	//	vector containing a list
-                                                        //  of all the Connection objects
-                                                        //  for this Driver
-
-            ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB;
-            SQLHANDLE	m_pDriverHandle;
-
-            virtual SQLHANDLE	EnvironmentHandle(::rtl::OUString &_rPath) = 0;
-            
-        public:
-
-            ODBCDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory);
-
-            // only possibility to get the odbc functions
-            virtual oslGenericFunction getOdbcFunction(sal_Int32 _nIndex)  const = 0;
-            // OComponentHelper
-            virtual void SAL_CALL disposing(void);
-            // XInterface
-            static ::rtl::OUString getImplementationName_Static(  ) throw(::com::sun::star::uno::RuntimeException);
-            static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(  ) throw (::com::sun::star::uno::RuntimeException);
-
-            // XServiceInfo
-            virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
-
-            // XDriver
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getMajorVersion(  ) throw(::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getMinorVersion(  ) throw(::com::sun::star::uno::RuntimeException);
-
-            ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const { return m_xORB; }
-        };
-    }
-
-}
-#endif //_CONNECTIVITY_ODBC_ODRIVER_HXX_
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx
deleted file mode 100644
index 87384925a3..0000000000
--- a/connectivity/source/inc/odbc/OFunctiondefs.hxx
+++ /dev/null
@@ -1,167 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-//--------------------------------------------------------------------------
-#ifndef _CONNECTIVITY_OFUNCTIONDEFS_HXX_
-#define _CONNECTIVITY_OFUNCTIONDEFS_HXX_
-
-#if defined(WNT)
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4005)
-#endif
-
-// just to go with calling convention of windows
-#define SQL_API __stdcall
-#include <odbc/sqlext.h>
-#undef SQL_API
-#define SQL_API __stdcall
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-#ifndef SQL_C_BOOKMARK
-#define SQL_C_BOOKMARK   SQL_C_ULONG                     /* BOOKMARK         */
-#endif
-
-#ifndef SQL_OPT_TRACE_OFF
-#define SQL_OPT_TRACE_OFF               0UL
-#endif
-
-#define SDB_ODBC_CHAR UCHAR
-
-#endif
-
-//--------------------------------------------------------------------------
-
-#ifdef OS2__00
-
-#ifdef ODBCIMP
-
-// Stub-Version: dynamische Bindung an die DLL zur Laufzeit.
-// odbcstub definiert die in den Quellen benutzten NSQL...-Methoden
-// als indirekte Funktionsaufrufe.
-// odbcimp zieht sich selbst preos2, odbc und postos2 an.
-//	#include "odbc3imp.hxx"
-
-#else
-
-// Zur Zeit verwenden wir die ODBC-DLL von Watcom-SQL direkt (ueber die
-// mitgelieferte Lib).
-
-#ifndef ODBC_OS2
-#define ODBC_OS2
-#endif
-
-#include <svpm.h>
-#include <odbc.h>
-#define SQL_API __syscall
-#ifndef SQL_MAX_MESSAGE_LENGTH
-#define SQL_MAX_MESSAGE_LENGTH MAX_MESSAGE_LENGTH
-#endif
-#ifndef SQL_MAX_DSN_LENGTH
-#define SQL_MAX_DSN_LENGTH MAX_DSN_LENGTH
-#endif
-#ifndef SQL_AUTOCOMMIT_ON
-#define SQL_AUTOCOMMIT_ON 1UL
-#endif
-#ifndef SQL_AUTOCOMMIT_OFF
-#define SQL_AUTOCOMMIT_OFF 0UL
-#endif
-
-#define SQL_FETCH_PRIOR SQL_FETCH_PREV
-#define SQL_NO_TOTAL (-4)
-
-#endif
-
-// In der ODBC.H von Watcom werden Strings als char * erwartet
-// (nicht, wie sonst bei ODBC ueblich, als UCHAR *).
-#if defined( ICC )
-#define SDB_ODBC_CHAR unsigned char
-#else
-#define SDB_ODBC_CHAR char
-#endif
-
-#endif
-
-//--------------------------------------------------------------------------
-
-#ifdef UNX
-
-// Zur Zeit verwenden wir die ODBC-shared library von Q+E direkt (ueber die
-// mitgelieferte Lib).
-
-#ifndef ODBC_UNX
-#define ODBC_UNX
-#endif
-#define CALLBACK
-#define EXPORT
-#ifdef SYSTEM_ODBC_HEADERS
-#include <sqlext.h>
-#else
-#include <odbc/sqlext.h>
-#endif
-#undef sal_Bool // Ist in qeodbc.h definiert, wird aber von solar.h noch einmal
-            // definiert.
-
-#define SDB_ODBC_CHAR UCHAR
-#define SQL_WCHAR		 	(-8)
-#define SQL_WVARCHAR	 	(-9)
-#define SQL_WLONGVARCHAR 	(-10)
-#define SQL_C_WCHAR			SQL_WCHAR
-
-
-#endif // UNX
-
-//--------------------------------------------------------------------------
-
-#ifndef SQL_WCHAR
-#define SQL_WCHAR		 	(-8)
-#endif
-#ifndef SQL_WVARCHAR
-#define SQL_WVARCHAR	 	(-9)
-#endif
-#ifndef SQL_WLONGVARCHAR
-#define SQL_WLONGVARCHAR 	(-10)
-#endif
-#ifndef SQL_C_WCHAR
-#define SQL_C_WCHAR			SQL_WCHAR
-#endif
-
-#ifdef UNICODE
-#define SQL_C_TCHAR		SQL_C_WCHAR
-#else
-#define SQL_C_TCHAR		SQL_C_CHAR
-#endif
-
-#endif // _CONNECTIVITY_OFUNCTIONDEFS_HXX_
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/odbc/OFunctions.hxx b/connectivity/source/inc/odbc/OFunctions.hxx
deleted file mode 100644
index 6e53f332b5..0000000000
--- a/connectivity/source/inc/odbc/OFunctions.hxx
+++ /dev/null
@@ -1,558 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _CONNECTIVITY_ODBC_OFUNCTIONS_HXX_
-#define _CONNECTIVITY_ODBC_OFUNCTIONS_HXX_
-
-#include "odbc/OFunctiondefs.hxx"
-#include <rtl/ustring.hxx>
-#include <osl/module.h>
-
-namespace connectivity
-{
-
-//	sal_Bool LoadFunctions(oslModule pODBCso, sal_Bool _bDS=sal_True);
-//	sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath);
-//	sal_Bool LoadLibrary_ADABAS(::rtl::OUString &_rPath);
-
-    // Connecting to a data source
-    typedef SQLRETURN  (SQL_API  *T3SQLAllocHandle) (SQLSMALLINT HandleType,SQLHANDLE InputHandle,SQLHANDLE *	OutputHandlePtr);
-
-    #define N3SQLAllocHandle(a,b,c) (*(T3SQLAllocHandle)getOdbcFunction(ODBC3SQLAllocHandle))(a,b,c)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLConnect) (SQLHDBC ConnectionHandle,SQLCHAR *ServerName,SQLSMALLINT	NameLength1,SQLCHAR *UserName,SQLSMALLINT NameLength2,SQLCHAR *Authentication,SQLSMALLINT NameLength3);
-
-    #define N3SQLConnect(a,b,c,d,e,f,g) (*(T3SQLConnect)getOdbcFunction(ODBC3SQLConnect))(a,b,c,d,e,f,g)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLDriverConnect) (	SQLHDBC			ConnectionHandle,
-                                                        HWND			WindowHandle,
-                                                        SQLCHAR *		InConnectionString,
-                                                        SQLSMALLINT		StringLength1,
-                                                        SQLCHAR *		OutConnectionString,
-                                                        SQLSMALLINT		BufferLength,
-                                                        SQLSMALLINT *	StringLength2Ptr,
-                                                        SQLUSMALLINT	DriverCompletion);
-
-    #define N3SQLDriverConnect(a,b,c,d,e,f,g,h) (*(T3SQLDriverConnect)getOdbcFunction(ODBC3SQLDriverConnect))(a,b,c,d,e,f,g,h)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLBrowseConnect) (	SQLHDBC			ConnectionHandle,
-                                                        SQLCHAR *		InConnectionString,
-                                                        SQLSMALLINT		StringLength1,
-                                                        SQLCHAR *		OutConnectionString,
-                                                        SQLSMALLINT		BufferLength,
-                                                        SQLSMALLINT *	StringLength2Ptr);
-
-    #define N3SQLBrowseConnect(a,b,c,d,e,f) (*(T3SQLBrowseConnect)getOdbcFunction(ODBC3SQLBrowseConnect))(a,b,c,d,e,f)
-
-    // Obtaining information about a driver and data source
-    typedef SQLRETURN  (SQL_API  *T3SQLDataSources) (	SQLHENV			EnvironmentHandle,
-                                                        SQLUSMALLINT	Direction,
-                                                        SQLCHAR *		ServerName,
-                                                        SQLSMALLINT		BufferLength1,
-                                                        SQLSMALLINT *	NameLength1Ptr,
-                                                        SQLCHAR *		Description,
-                                                        SQLSMALLINT		BufferLength2,
-                                                        SQLSMALLINT *	NameLength2Ptr);
-
-    #define N3SQLDataSources(a,b,c,d,e,f,g,h) (*(T3SQLDataSources)getOdbcFunction(ODBC3SQLDataSources))(a,b,c,d,e,f,g,h)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLDrivers) (	SQLHENV			EnvironmentHandle,
-                                                    SQLUSMALLINT	Direction,
-                                                    SQLCHAR *		DriverDescription,
-                                                    SQLSMALLINT		BufferLength1,
-                                                    SQLSMALLINT *	DescriptionLengthPtr,
-                                                    SQLCHAR *		DriverAttributes,
-                                                    SQLSMALLINT		BufferLength2,
-                                                    SQLSMALLINT *	AttributesLengthPtr);
-
-    #define N3SQLDrivers(a,b,c,d,e,f,g,h) (*(T3SQLDrivers)getOdbcFunction(ODBC3SQLDrivers))(a,b,c,d,e,f,g,h)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLGetInfo) (	SQLHDBC			ConnectionHandle,
-                                                    SQLUSMALLINT	InfoType,
-                                                    SQLPOINTER		InfoValuePtr,
-                                                    SQLSMALLINT		BufferLength,
-                                                    SQLSMALLINT *	StringLengthPtr);
-
-    #define N3SQLGetInfo(a,b,c,d,e) (*(T3SQLGetInfo)getOdbcFunction(ODBC3SQLGetInfo))(a,b,c,d,e)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLGetFunctions) (SQLHDBC			ConnectionHandle,
-                                                    SQLUSMALLINT	FunctionId,
-                                                    SQLUSMALLINT *	SupportedPtr);
-
-    #define N3SQLGetFunctions(a,b,c) (*(T3SQLGetFunctions)getOdbcFunction(ODBC3SQLGetFunctions))(a,b,c)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLGetTypeInfo) (	SQLHSTMT	StatementHandle,
-                                                    SQLSMALLINT		DataType);
-
-    #define N3SQLGetTypeInfo(a,b) (*(T3SQLGetTypeInfo)getOdbcFunction(ODBC3SQLGetTypeInfo))(a,b)
-
-    // Setting and retrieving driver attributes
-    typedef SQLRETURN (SQL_API *T3SQLSetConnectAttr)(SQLHDBC		ConnectionHandle,
-                                                    SQLINTEGER		Attribute,
-                                                    SQLPOINTER		ValuePtr,
-                                                    SQLINTEGER		StringLength);
-
-    #define N3SQLSetConnectAttr(a,b,c,d) (*(T3SQLSetConnectAttr)getOdbcFunction(ODBC3SQLSetConnectAttr))(a,b,c,d)
-
-    typedef SQLRETURN (SQL_API *T3SQLGetConnectAttr) (SQLHDBC		ConnectionHandle,
-                                                    SQLINTEGER		Attribute,
-                                                    SQLPOINTER		ValuePtr,
-                                                    SQLINTEGER		BufferLength,
-                                                    SQLINTEGER*		StringLength);
-
-    #define N3SQLGetConnectAttr(a,b,c,d,e) (*(T3SQLGetConnectAttr)getOdbcFunction(ODBC3SQLGetConnectAttr))(a,b,c,d,e)
-
-
-    typedef SQLRETURN (SQL_API *T3SQLSetEnvAttr) (	SQLHENV			EnvironmentHandle,
-                                                    SQLINTEGER		Attribute,
-                                                    SQLPOINTER		ValuePtr,
-                                                    SQLINTEGER		StringLength);
-
-    #define N3SQLSetEnvAttr(a,b,c,d) (*(T3SQLSetEnvAttr)getOdbcFunction(ODBC3SQLSetEnvAttr))(a,b,c,d)
-
-    typedef SQLRETURN (SQL_API *T3SQLGetEnvAttr) (	SQLHENV			EnvironmentHandle,
-                                                    SQLINTEGER		Attribute,
-                                                    SQLPOINTER		ValuePtr,
-                                                    SQLINTEGER		BufferLength,
-                                                    SQLINTEGER*		StringLength);
-
-    #define N3SQLGetEnvAttr(a,b,c,d,e) (*(T3SQLGetEnvAttr)getOdbcFunction(ODBC3SQLGetEnvAttr))(a,b,c,d,e)
-
-
-    typedef SQLRETURN (SQL_API *T3SQLSetStmtAttr) (	SQLHSTMT		StatementHandle,
-                                                    SQLINTEGER		Attribute,
-                                                    SQLPOINTER		ValuePtr,
-                                                    SQLINTEGER		StringLength);
-
-    #define N3SQLSetStmtAttr(a,b,c,d) (*(T3SQLSetStmtAttr)getOdbcFunction(ODBC3SQLSetStmtAttr))(a,b,c,d)
-
-    typedef SQLRETURN (SQL_API *T3SQLGetStmtAttr) (	SQLHSTMT		StatementHandle,
-                                                    SQLINTEGER		Attribute,
-                                                    SQLPOINTER		ValuePtr,
-                                                    SQLINTEGER		BufferLength,
-                                                    SQLINTEGER*		StringLength);
-
-    #define N3SQLGetStmtAttr(a,b,c,d,e) (*(T3SQLGetStmtAttr)getOdbcFunction(ODBC3SQLGetStmtAttr))(a,b,c,d,e)
-
-    // Setting and retrieving descriptor fields
-    /*typedef SQLRETURN (SQL_API *T3SQLSetDescField) (SQLHDESC		DescriptorHandle,
-                                                    SQLSMALLINT		RecNumber,
-                                                    SQLSMALLINT		FieldIdentifier,
-                                                    SQLPOINTER		ValuePtr,
-                                                    SQLINTEGER		BufferLength);
-
-    #define N3SQLSetDescField(a,b,c,d,e) (*(T3SQLSetDescField)getOdbcFunction(ODBC3SQLSetDescField))(a,b,c,d,e)
-
-    typedef SQLRETURN (SQL_API *T3SQLGetDescField) (	SQLHDESC		DescriptorHandle,
-                                                    SQLSMALLINT		RecNumber,
-                                                    SQLSMALLINT		FieldIdentifier,
-                                                    SQLPOINTER		ValuePtr,
-                                                    SQLINTEGER		BufferLength,
-                                                    SQLINTEGER *	StringLengthPtr);
-
-    #define N3SQLGetDescField(a,b,c,d,e,f) (*(T3SQLGetDescField)getOdbcFunction(ODBC3SQLGetDescField))(a,b,c,d,e,f)
-
-
-    typedef SQLRETURN (SQL_API *T3SQLGetDescRec) (	SQLHDESC			DescriptorHandle,
-                                                    SQLSMALLINT			RecNumber,
-                                                    SQLCHAR *			Name,
-                                                    SQLSMALLINT			BufferLength,
-                                                    SQLSMALLINT *		StringLengthPtr,
-                                                    SQLSMALLINT *		TypePtr,
-                                                    SQLSMALLINT *		SubTypePtr,
-                                                    SQLLEN *			LengthPtr,
-                                                    SQLSMALLINT *		PrecisionPtr,
-                                                    SQLSMALLINT *		ScalePtr,
-                                                    SQLSMALLINT *		NullablePtr);
-
-    #define N3SQLGetDescRec(a,b,c,d,e,f,g,h,i,j,k) (*(T3SQLGetDescRec)getOdbcFunction(ODBC3SQLGetDescRec))(a,b,c,d,e,f,g,h,i,j,k)
-
-
-    typedef SQLRETURN (SQL_API *T3SQLSetDescRec) (	SQLHDESC			DescriptorHandle,
-                                                    SQLSMALLINT			RecNumber,
-                                                    SQLSMALLINT			Type,
-                                                    SQLSMALLINT			SubType,
-                                                    SQLINTEGER			Length,
-                                                    SQLSMALLINT			Precision,
-                                                    SQLSMALLINT			Scale,
-                                                    SQLPOINTER			DataPtr,
-                                                    SQLLEN *			StringLengthPtr,
-                                                    SQLLEN *			IndicatorPtr);
-
-    #define N3SQLSetDescRec(a,b,c,d,e,f,g,h,i,j) (*(T3SQLSetDescRec)getOdbcFunction(ODBC3SQLSetDescRec))(a,b,c,d,e,f,g,h,i,j)
-    */
-
-    // Preparing SQL requests
-    typedef SQLRETURN  (SQL_API  *T3SQLPrepare) (		SQLHSTMT			StatementHandle,
-                                                    SQLCHAR *			StatementText,
-                                                    SQLINTEGER			TextLength);
-
-    #define N3SQLPrepare(a,b,c) (*(T3SQLPrepare)getOdbcFunction(ODBC3SQLPrepare))(a,b,c)
-
-    typedef SQLRETURN (SQL_API  *T3SQLBindParameter) (SQLHSTMT			StatementHandle,
-                                                    SQLUSMALLINT		ParameterNumber,
-                                                    SQLSMALLINT			InputOutputType,
-                                                    SQLSMALLINT			ValueType,
-                                                    SQLSMALLINT			ParameterType,
-                                                    SQLULEN				ColumnSize,
-                                                    SQLSMALLINT			DecimalDigits,
-                                                    SQLPOINTER			ParameterValuePtr,
-                                                    SQLLEN				BufferLength,
-                                                    SQLLEN *			StrLen_or_IndPtr);
-
-    #define N3SQLBindParameter(a,b,c,d,e,f,g,h,i,j) (*(T3SQLBindParameter)getOdbcFunction(ODBC3SQLBindParameter))(a,b,c,d,e,f,g,h,i,j)
-
-    /*typedef SQLRETURN (SQL_API  *T3SQLGetCursorName) (SQLHSTMT			StatementHandle,
-                                                    SQLCHAR *			CursorName,
-                                                    SQLSMALLINT			BufferLength,
-                                                    SQLSMALLINT *		NameLengthPtr);
-
-    #define N3SQLGetCursorName(a,b,c,d) (*(T3SQLGetCursorName)getOdbcFunction(ODBC3SQLGetCursorName))(a,b,c,d)
-    */
-
-    typedef SQLRETURN (SQL_API  *T3SQLSetCursorName) (SQLHSTMT			StatementHandle,
-                                                    SQLCHAR *			CursorName,
-                                                    SQLSMALLINT			NameLength);
-
-    #define N3SQLSetCursorName(a,b,c) (*(T3SQLSetCursorName)getOdbcFunction(ODBC3SQLSetCursorName))(a,b,c)
-
-    // Submitting requests
-    typedef SQLRETURN  (SQL_API  *T3SQLExecute) (		SQLHSTMT			StatementHandle);
-
-    #define N3SQLExecute(a) (*(T3SQLExecute)getOdbcFunction(ODBC3SQLExecute))(a)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLExecDirect) (	SQLHSTMT			StatementHandle,
-                                                    SQLCHAR *			StatementText,
-                                                    SQLINTEGER			TextLength);
-
-    #define N3SQLExecDirect(a,b,c) (*(T3SQLExecDirect)getOdbcFunction(ODBC3SQLExecDirect))(a,b,c)
-
-    /*typedef SQLRETURN  (SQL_API  *T3SQLNativeSql) (	SQLHDBC				ConnectionHandle,
-                                                    SQLCHAR *			InStatementText,
-                                                    SQLINTEGER			TextLength1,
-                                                    SQLCHAR *			utStatementText,
-                                                    SQLINTEGER			BufferLength,
-                                                    SQLINTEGER *		TextLength2Ptr);
-
-    #define N3SQLNativeSql(a,b,c,d,e,f) (*(T3SQLNativeSql)getOdbcFunction(ODBC3SQLNativeSql))(a,b,c,d,e,f)*/
-
-    typedef SQLRETURN (SQL_API  *T3SQLDescribeParam) (SQLHSTMT			StatementHandle,
-                                                    SQLUSMALLINT		ParameterNumber,
-                                                    SQLSMALLINT *		DataTypePtr,
-                                                    SQLULEN *			ParameterSizePtr,
-                                                    SQLSMALLINT *		DecimalDigitsPtr,
-                                                    SQLSMALLINT *		NullablePtr);
-
-    #define N3SQLDescribeParam(a,b,c,d,e,f) (*(T3SQLDescribeParam)getOdbcFunction(ODBC3SQLDescribeParam))(a,b,c,d,e,f)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLNumParams) (	SQLHSTMT			StatementHandle,
-                                                    SQLSMALLINT *		ParameterCountPtr);
-
-    #define N3SQLNumParams(a,b) (*(T3SQLNumParams)getOdbcFunction(ODBC3SQLNumParams))(a,b)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLParamData) (	SQLHSTMT			StatementHandle,
-                                                    SQLPOINTER *		ValuePtrPtr);
-
-    #define N3SQLParamData(a,b) (*(T3SQLParamData)getOdbcFunction(ODBC3SQLParamData))(a,b)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLPutData) (		SQLHSTMT			StatementHandle,
-                                                    SQLPOINTER			DataPtr,
-                                                    SQLLEN				StrLen_or_Ind);
-
-    #define N3SQLPutData(a,b,c) (*(T3SQLPutData)getOdbcFunction(ODBC3SQLPutData))(a,b,c)
-
-    // Retrieving results and information about results
-    typedef SQLRETURN  (SQL_API  *T3SQLRowCount) (	SQLHSTMT			StatementHandle,
-                                                    SQLLEN *			RowCountPtr);
-
-    #define N3SQLRowCount(a,b) (*(T3SQLRowCount)getOdbcFunction(ODBC3SQLRowCount))(a,b)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLNumResultCols) (SQLHSTMT			StatementHandle,
-                                                    SQLSMALLINT *		ColumnCountPtr);
-
-    #define N3SQLNumResultCols(a,b) (*(T3SQLNumResultCols)getOdbcFunction(ODBC3SQLNumResultCols))(a,b)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLDescribeCol) (	SQLHSTMT			StatementHandle,
-                                                    SQLUSMALLINT		ColumnNumber,
-                                                    SQLCHAR *			ColumnName,
-                                                    SQLSMALLINT			BufferLength,
-                                                    SQLSMALLINT *		NameLengthPtr,
-                                                    SQLSMALLINT *		DataTypePtr,
-                                                    SQLULEN *			ColumnSizePtr,
-                                                    SQLSMALLINT *		DecimalDigitsPtr,
-                                                    SQLSMALLINT *		NullablePtr);
-
-    #define N3SQLDescribeCol(a,b,c,d,e,f,g,h,i) (*(T3SQLDescribeCol)getOdbcFunction(ODBC3SQLDescribeCol))(a,b,c,d,e,f,g,h,i)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLColAttribute) (SQLHSTMT			StatementHandle,
-                                                    SQLUSMALLINT		ColumnNumber,
-                                                    SQLUSMALLINT		FieldIdentifier,
-                                                    SQLPOINTER			CharacterAttributePtr,
-                                                    SQLSMALLINT			BufferLength,
-                                                    SQLSMALLINT *		StringLengthPtr,
-                                                    SQLLEN *			NumericAttributePtr);
-
-    #define N3SQLColAttribute(a,b,c,d,e,f,g) (*(T3SQLColAttribute)getOdbcFunction(ODBC3SQLColAttribute))(a,b,c,d,e,f,g)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLBindCol) (		SQLHSTMT			StatementHandle,
-                                                    SQLUSMALLINT		ColumnNumber,
-                                                    SQLSMALLINT			TargetType,
-                                                    SQLPOINTER			TargetValuePtr,
-                                                    SQLLEN				BufferLength,
-                                                    SQLLEN *			StrLen_or_IndPtr);
-
-    #define N3SQLBindCol(a,b,c,d,e,f) (*(T3SQLBindCol)getOdbcFunction(ODBC3SQLBindCol))(a,b,c,d,e,f)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLFetch) (		SQLHSTMT			StatementHandle);
-
-    #define N3SQLFetch(a) (*(T3SQLFetch)getOdbcFunction(ODBC3SQLFetch))(a)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLFetchScroll) (	SQLHSTMT			StatementHandle,
-                                                    SQLSMALLINT			FetchOrientation,
-                                                    SQLLEN				FetchOffset);
-
-    #define N3SQLFetchScroll(a,b,c) (*(T3SQLFetchScroll)getOdbcFunction(ODBC3SQLFetchScroll))(a,b,c)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLGetData) (		SQLHSTMT			StatementHandle,
-                                                    SQLUSMALLINT		ColumnNumber,
-                                                    SQLSMALLINT			TargetType,
-                                                    SQLPOINTER			TargetValuePtr,
-                                                    SQLLEN				BufferLength,
-                                                    SQLLEN *			StrLen_or_IndPtr);
-
-    #define N3SQLGetData(a,b,c,d,e,f) (*(T3SQLGetData)getOdbcFunction(ODBC3SQLGetData))(a,b,c,d,e,f)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLSetPos) (		SQLHSTMT			StatementHandle,
-                                                    SQLSETPOSIROW		RowNumber,
-                                                    SQLUSMALLINT		Operation,
-                                                    SQLUSMALLINT		LockType);
-
-    #define N3SQLSetPos(a,b,c,d) (*(T3SQLSetPos)getOdbcFunction(ODBC3SQLSetPos))(a,b,c,d)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLBulkOperations) (	SQLHSTMT		StatementHandle,
-                                                        SQLSMALLINT	Operation);
-
-    #define N3SQLBulkOperations(a,b) (*(T3SQLBulkOperations)getOdbcFunction(ODBC3SQLBulkOperations))(a,b)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLMoreResults) (	SQLHSTMT			StatementHandle);
-
-    #define N3SQLMoreResults(a) (*(T3SQLMoreResults)getOdbcFunction(ODBC3SQLMoreResults))(a)
-
-    /*typedef SQLRETURN  (SQL_API  *T3SQLGetDiagField) (SQLSMALLINT			HandleType,
-                                                    SQLHANDLE			Handle,
-                                                    SQLSMALLINT			RecNumber,
-                                                    SQLSMALLINT			DiagIdentifier,
-                                                    SQLPOINTER			DiagInfoPtr,
-                                                    SQLSMALLINT			BufferLength,
-                                                    SQLSMALLINT *		StringLengthPtr);
-
-    #define N3SQLGetDiagField(a,b,c,d,e,f,g) (*(T3SQLGetDiagField)getOdbcFunction(ODBC3SQLGetDiagField))(a,b,c,d,e,f,g)*/
-
-    typedef SQLRETURN  (SQL_API  *T3SQLGetDiagRec) (	SQLSMALLINT			HandleType,
-                                                    SQLHANDLE			Handle,
-                                                    SQLSMALLINT			RecNumber,
-                                                    SQLCHAR *			Sqlstate,
-                                                    SQLINTEGER *		NativeErrorPtr,
-                                                    SQLCHAR *			MessageText,
-                                                    SQLSMALLINT			BufferLength,
-                                                    SQLSMALLINT *		TextLengthPtr);
-
-
-    #define N3SQLGetDiagRec(a,b,c,d,e,f,g,h) (*(T3SQLGetDiagRec)getOdbcFunction(ODBC3SQLGetDiagRec))(a,b,c,d,e,f,g,h)
-
-    // Obtaining information about the data source's system tables (catalog functions)
-    typedef SQLRETURN  (SQL_API  *T3SQLColumnPrivileges) (SQLHSTMT		StatementHandle,
-                                                    SQLCHAR *			CatalogName,
-                                                    SQLSMALLINT			NameLength1,
-                                                    SQLCHAR *			SchemaName,
-                                                    SQLSMALLINT			NameLength2,
-                                                    SQLCHAR *			TableName,
-                                                    SQLSMALLINT			NameLength3,
-                                                    SQLCHAR *			ColumnName,
-                                                    SQLSMALLINT			NameLength4);
-
-    #define N3SQLColumnPrivileges(a,b,c,d,e,f,g,h,i) (*(T3SQLColumnPrivileges)getOdbcFunction(ODBC3SQLColumnPrivileges))(a,b,c,d,e,f,g,h,i)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLColumns) (		SQLHSTMT			StatementHandle,
-                                                    SQLCHAR *			CatalogName,
-                                                    SQLSMALLINT			NameLength1,
-                                                    SQLCHAR *			SchemaName,
-                                                    SQLSMALLINT			NameLength2,
-                                                    SQLCHAR *			TableName,
-                                                    SQLSMALLINT			NameLength3,
-                                                    SQLCHAR *			ColumnName,
-                                                    SQLSMALLINT			NameLength4);
-
-    #define N3SQLColumns(a,b,c,d,e,f,g,h,i) (*(T3SQLColumns)getOdbcFunction(ODBC3SQLColumns))(a,b,c,d,e,f,g,h,i)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLForeignKeys) (	SQLHSTMT			StatementHandle,
-                                                    SQLCHAR *			PKCatalogName,
-                                                    SQLSMALLINT			NameLength1,
-                                                    SQLCHAR *			PKSchemaName,
-                                                    SQLSMALLINT			NameLength2,
-                                                    SQLCHAR *			PKTableName,
-                                                    SQLSMALLINT			NameLength3,
-                                                    SQLCHAR *			FKCatalogName,
-                                                    SQLSMALLINT			NameLength4,
-                                                    SQLCHAR *			FKSchemaName,
-                                                    SQLSMALLINT			NameLength5,
-                                                    SQLCHAR *			FKTableName,
-                                                    SQLSMALLINT			NameLength6);
-
-    #define N3SQLForeignKeys(a,b,c,d,e,f,g,h,i,j,k,l,m) (*(T3SQLForeignKeys)getOdbcFunction(ODBC3SQLForeignKeys))(a,b,c,d,e,f,g,h,i,j,k,l,m)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLPrimaryKeys) (	SQLHSTMT			StatementHandle,
-                                                    SQLCHAR *			CatalogName,
-                                                    SQLSMALLINT			NameLength1,
-                                                    SQLCHAR *			SchemaName,
-                                                    SQLSMALLINT			NameLength2,
-                                                    SQLCHAR *			TableName,
-                                                    SQLSMALLINT			NameLength3);
-
-    #define N3SQLPrimaryKeys(a,b,c,d,e,f,g) (*(T3SQLPrimaryKeys)getOdbcFunction(ODBC3SQLPrimaryKeys))(a,b,c,d,e,f,g)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLProcedureColumns) (SQLHSTMT		StatementHandle,
-                                                    SQLCHAR *			CatalogName,
-                                                    SQLSMALLINT			NameLength1,
-                                                    SQLCHAR *			SchemaName,
-                                                    SQLSMALLINT			NameLength2,
-                                                    SQLCHAR *			ProcName,
-                                                    SQLSMALLINT			NameLength3,
-                                                    SQLCHAR *			ColumnName,
-                                                    SQLSMALLINT			NameLength4);
-
-    #define N3SQLProcedureColumns(a,b,c,d,e,f,g,h,i) (*(T3SQLProcedureColumns)getOdbcFunction(ODBC3SQLProcedureColumns))(a,b,c,d,e,f,g,h,i)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLProcedures) (	SQLHSTMT			StatementHandle,
-                                                    SQLCHAR *			CatalogName,
-                                                    SQLSMALLINT			NameLength1,
-                                                    SQLCHAR *			SchemaName,
-                                                    SQLSMALLINT			NameLength2,
-                                                    SQLCHAR *			ProcName,
-                                                    SQLSMALLINT			NameLength3);
-
-    #define N3SQLProcedures(a,b,c,d,e,f,g) (*(T3SQLProcedures)getOdbcFunction(ODBC3SQLProcedures))(a,b,c,d,e,f,g)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLSpecialColumns) (SQLHSTMT			StatementHandle,
-                                                    SQLUSMALLINT		IdentifierType,
-                                                    SQLCHAR *			CatalogName,
-                                                    SQLSMALLINT			NameLength1,
-                                                    SQLCHAR *			SchemaName,
-                                                    SQLSMALLINT			NameLength2,
-                                                    SQLCHAR *			TableName,
-                                                    SQLSMALLINT			NameLength3,
-                                                    SQLUSMALLINT		Scope,
-                                                    SQLUSMALLINT		Nullable);
-
-    #define N3SQLSpecialColumns(a,b,c,d,e,f,g,h,i,j) (*(T3SQLSpecialColumns)getOdbcFunction(ODBC3SQLSpecialColumns))(a,b,c,d,e,f,g,h,i,j)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLStatistics) (	SQLHSTMT			StatementHandle,
-                                                    SQLCHAR *			CatalogName,
-                                                    SQLSMALLINT			NameLength1,
-                                                    SQLCHAR *			SchemaName,
-                                                    SQLSMALLINT			NameLength2,
-                                                    SQLCHAR *			TableName,
-                                                    SQLSMALLINT			NameLength3,
-                                                    SQLUSMALLINT		Unique,
-                                                    SQLUSMALLINT		Reserved);
-
-    #define N3SQLStatistics(a,b,c,d,e,f,g,h,i) (*(T3SQLStatistics)getOdbcFunction(ODBC3SQLStatistics))(a,b,c,d,e,f,g,h,i)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLTablePrivileges) (SQLHSTMT			StatementHandle,
-                                                    SQLCHAR *			CatalogName,
-                                                    SQLSMALLINT			NameLength1,
-                                                    SQLCHAR *			SchemaName,
-                                                    SQLSMALLINT			NameLength2,
-                                                    SQLCHAR *			TableName,
-                                                    SQLSMALLINT			NameLength3);
-
-    #define N3SQLTablePrivileges(a,b,c,d,e,f,g) (*(T3SQLTablePrivileges)getOdbcFunction(ODBC3SQLTablePrivileges))(a,b,c,d,e,f,g)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLTables) (	SQLHSTMT				StatementHandle,
-                                                    SQLCHAR *				CatalogName,
-                                                    SQLSMALLINT				NameLength1,
-                                                    SQLCHAR *				SchemaName,
-                                                    SQLSMALLINT				NameLength2,
-                                                    SQLCHAR *				TableName,
-                                                    SQLSMALLINT				NameLength3,
-                                                    SQLCHAR *				TableType,
-                                                    SQLSMALLINT				NameLength4);
-
-    #define N3SQLTables(a,b,c,d,e,f,g,h,i) (*(T3SQLTables)getOdbcFunction(ODBC3SQLTables))(a,b,c,d,e,f,g,h,i)
-
-    // Terminating a statement
-    typedef SQLRETURN  (SQL_API  *T3SQLFreeStmt) (	SQLHSTMT				StatementHandle,
-                                                    SQLUSMALLINT			Option);
-
-    #define N3SQLFreeStmt(a,b) (*(T3SQLFreeStmt)getOdbcFunction(ODBC3SQLFreeStmt))(a,b)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLCloseCursor) (SQLHSTMT			StatementHandle);
-
-    #define N3SQLCloseCursor(a) (*(T3SQLCloseCursor)getOdbcFunction(ODBC3SQLCloseCursor))(a)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLCancel) (	SQLHSTMT				StatementHandle);
-
-    #define N3SQLCancel(a) (*(T3SQLCancel)getOdbcFunction(ODBC3SQLCancel))(a)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLEndTran) (	SQLSMALLINT				HandleType,
-                                                    SQLHANDLE				Handle,
-                                                    SQLSMALLINT				CompletionType);
-
-    #define N3SQLEndTran(a,b,c) (*(T3SQLEndTran)getOdbcFunction(ODBC3SQLEndTran))(a,b,c)
-
-    // Terminating a connection
-    typedef SQLRETURN  (SQL_API  *T3SQLDisconnect) (SQLHDBC	ConnectionHandle);
-
-    #define N3SQLDisconnect(a) (*(T3SQLDisconnect)getOdbcFunction(ODBC3SQLDisconnect))(a)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLFreeHandle) (SQLSMALLINT				HandleType,
-                                                    SQLHANDLE				Handle);
-
-    #define N3SQLFreeHandle(a,b) (*(T3SQLFreeHandle)getOdbcFunction(ODBC3SQLFreeHandle))(a,b)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLGetCursorName) (	SQLHSTMT			StatementHandle,
-                                                        SQLCHAR *			CursorName,
-                                                        SQLSMALLINT			BufferLength,
-                                                        SQLSMALLINT*		NameLength2);
-
-    #define N3SQLGetCursorName(a,b,c,d) (*(T3SQLGetCursorName)getOdbcFunction(ODBC3SQLGetCursorName))(a,b,c,d)
-
-    typedef SQLRETURN  (SQL_API  *T3SQLNativeSql) (	SQLHSTMT				ConnectionHandle,
-                                                    SQLCHAR *				InStatementText,
-                                                    SQLINTEGER				TextLength1,
-                                                    SQLCHAR *				OutStatementText,
-                                                    SQLINTEGER				BufferLength,
-                                                    SQLINTEGER *			TextLength2Ptr);
-
-    #define N3SQLNativeSql(a,b,c,d,e,f) (*(T3SQLNativeSql)getOdbcFunction(ODBC3SQLNativeSql))(a,b,c,d,e,f)
-}
-
-#endif // _CONNECTIVITY_ODBC_OFUNCTIONS_HXX_
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx
deleted file mode 100644
index 1e8362834b..0000000000
--- a/connectivity/source/inc/odbc/OPreparedStatement.hxx
+++ /dev/null
@@ -1,173 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _CONNECTIVITY_ODBC_OPREPAREDSTATEMENT_HXX_
-#define _CONNECTIVITY_ODBC_OPREPAREDSTATEMENT_HXX_
-
-#include "odbc/odbcbasedllapi.hxx"
-#include "odbc/OStatement.hxx"
-#include <com/sun/star/sdbc/XPreparedStatement.hpp>
-#include <com/sun/star/sdbc/XParameters.hpp>
-#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-#include <com/sun/star/sdbc/XPreparedBatchExecution.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <cppuhelper/implbase5.hxx>
-
-namespace connectivity
-{
-    namespace odbc
-    {
-
-        class OBoundParam;
-        typedef ::cppu::ImplHelper5<	::com::sun::star::sdbc::XPreparedStatement,
-                                        ::com::sun::star::sdbc::XParameters,
-                                        ::com::sun::star::sdbc::XPreparedBatchExecution,
-                                        ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
-                                        ::com::sun::star::lang::XServiceInfo> OPreparedStatement_BASE;
-
-        class OOO_DLLPUBLIC_ODBCBASE OPreparedStatement :
-                                    public	OStatement_BASE2,
-                                    public  OPreparedStatement_BASE
-        {
-        protected:
-            struct Parameter
-            {
-                ::com::sun::star::uno::Any	aValue;
-                sal_Int32					nDataType;
-
-                Parameter(const ::com::sun::star::uno::Any&	rValue,
-                          sal_Int32							rDataType) : aValue(rValue),nDataType(rDataType)
-                {
-                }
-
-            };
-
-            ::std::vector< Parameter>					m_aParameters;
-            //====================================================================
-            // Data attributes
-            //====================================================================
-            SQLSMALLINT 	numParams;		// Number of parameter markers
-                                            //  for the prepared statement
-
-            OBoundParam*	boundParams;
-                            // Array of bound parameter
-                            //  objects.  Each parameter
-                            //  marker will have a
-                            //  corresponding object to
-                            //  hold bind information, and
-                            //  resulting data.
-            ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData >	m_xMetaData;
-            sal_Bool																		m_bPrepared;
-
-            void FreeParams();
-            void putParamData (sal_Int32 index) throw(::com::sun::star::sdbc::SQLException);
-            void setStream (sal_Int32 ParameterIndex,const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x,
-                                                        SQLLEN length,sal_Int32 SQLtype) throw(::com::sun::star::sdbc::SQLException);
-            sal_Int32 getParamLength (	sal_Int32 index);
-            sal_Int8* getLengthBuf (sal_Int32 index);
-            sal_Int8* getDataBuf (sal_Int32 index);
-            sal_Int8* allocBindBuf (	sal_Int32 index,	sal_Int32 bufLen);
-            void initBoundParam () throw(::com::sun::star::sdbc::SQLException);
-            void setParameter(sal_Int32 parameterIndex,sal_Int32 _nType,sal_Int32 _nSize,void* _pData);
-
-            sal_Int32 getPrecision ( sal_Int32 sqlType);
-
-            sal_Bool isPrepared() const { return m_bPrepared;}
-            void prepareStatement();
-            void checkParameterIndex(sal_Int32 _parameterIndex);
-            void setDecimal( sal_Int32 parameterIndex, const ::rtl::OUString& x );
-
-            /**
-                creates the driver specific resultset (factory)
-            */
-            virtual OResultSet* createResulSet();
-
-        protected:
-            virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,
-                                                                   const ::com::sun::star::uno::Any& rValue)
-                                                                        throw (::com::sun::star::uno::Exception);
-        public:
-            DECLARE_SERVICE_INFO();
-            // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
-            OPreparedStatement( OConnection* _pConnection,const ::rtl::OUString& sql);
-
-            //XInterface
-            virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL acquire() throw();
-            virtual void SAL_CALL release() throw();
-            //XTypeProvider
-            virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
-
-            // XPreparedStatement
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL executeUpdate(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL execute(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            // XParameters
-            virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL clearParameters(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            // XPreparedBatchExecution
-            virtual void SAL_CALL addBatch(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL clearBatch(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            // XCloseable
-            virtual void SAL_CALL close(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            // XResultSetMetaDataSupplier
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-
-        public:
-            using OStatement_Base::executeQuery;
-            using OStatement_Base::executeUpdate;
-            using OStatement_Base::execute;
-        };
-    }
-}
-#endif // _CONNECTIVITY_ODBC_OPREPAREDSTATEMENT_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx
deleted file mode 100644
index 7a9b399694..0000000000
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ /dev/null
@@ -1,329 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _CONNECTIVITY_ODBC_ORESULTSET_HXX_
-#define _CONNECTIVITY_ODBC_ORESULTSET_HXX_
-
-#include <com/sun/star/sdbc/XResultSet.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-#include <com/sun/star/sdbc/XCloseable.hpp>
-#include <com/sun/star/sdbc/XColumnLocate.hpp>
-#include <com/sun/star/util/XCancellable.hpp>
-#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
-#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
-#include <com/sun/star/sdbc/XRowUpdate.hpp>
-#include <com/sun/star/sdbcx/XRowLocate.hpp>
-#include <com/sun/star/sdbcx/XDeleteRows.hpp>
-#include <cppuhelper/compbase12.hxx>
-#include <comphelper/proparrhlp.hxx>
-#include "odbc/OFunctions.hxx"
-#include "odbc/OStatement.hxx"
-#include "odbc/odbcbasedllapi.hxx"
-#include "connectivity/CommonTools.hxx"
-#include "connectivity/FValue.hxx"
-#include "TSkipDeletedSet.hxx"
-
-namespace connectivity
-{
-    namespace odbc
-    {
-
-        /*
-        **	java_sql_ResultSet
-        */
-        typedef ::cppu::WeakComponentImplHelper12<      ::com::sun::star::sdbc::XResultSet,
-                                                        ::com::sun::star::sdbc::XRow,
-                                                        ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
-                                                        ::com::sun::star::util::XCancellable,
-                                                        ::com::sun::star::sdbc::XWarningsSupplier,
-                                                        ::com::sun::star::sdbc::XResultSetUpdate,
-                                                        ::com::sun::star::sdbc::XRowUpdate,
-                                                        ::com::sun::star::sdbcx::XRowLocate,
-                                                        ::com::sun::star::sdbcx::XDeleteRows,
-                                                        ::com::sun::star::sdbc::XCloseable,
-                                                        ::com::sun::star::sdbc::XColumnLocate,
-                                                        ::com::sun::star::lang::XServiceInfo> OResultSet_BASE;
-
-
-        typedef ::std::pair<sal_Int64,sal_Int32> TVoidPtr;
-        typedef ::std::allocator< TVoidPtr > TVoidAlloc;
-        typedef ::std::vector<TVoidPtr> TVoidVector;
-        //	typedef ::com::sun::star::uno::Sequence<TVoidPtr> TVoidVector;
-        /// unary_function Functor object for class ZZ returntype is void
-        struct OOO_DLLPUBLIC_ODBCBASE TBookmarkPosMapCompare : ::std::binary_function< ::com::sun::star::uno::Sequence<sal_Int8>, ::com::sun::star::uno::Sequence<sal_Int8>, bool >
-        {
-            inline bool operator()( const ::com::sun::star::uno::Sequence<sal_Int8>& _rLH,
-                                    const ::com::sun::star::uno::Sequence<sal_Int8>& _rRH) const
-            {
-                if(_rLH.getLength() == _rRH.getLength())
-                {
-                    sal_Int32 nCount = _rLH.getLength();
-                    if(nCount != 4)
-                    {
-                        const sal_Int8* pLHBack	= _rLH.getConstArray() + nCount - 1;
-                        const sal_Int8* pRHBack	= _rRH.getConstArray() + nCount - 1;
-
-                        sal_Int32 i;
-                        for(i=0;i < nCount;++i,--pLHBack,--pRHBack)
-                        {
-                            if(!(*pLHBack) && *pRHBack)
-                                return sal_True;
-                            else if(*pLHBack && !(*pRHBack))
-                                return sal_False;
-                        }
-                        for(i=0,++pLHBack,++pRHBack;i < nCount;++pLHBack,++pRHBack,++i)
-                            if(*pLHBack < *pRHBack)
-                                return sal_True;
-                        return sal_False;
-                    }
-                    else
-                        return *reinterpret_cast<const sal_Int32*>(_rLH.getConstArray()) < *reinterpret_cast<const sal_Int32*>(_rRH.getConstArray());
-
-                }
-                else
-                    return _rLH.getLength() < _rRH.getLength();
-            }
-        };
-
-        typedef ::std::map< ::com::sun::star::uno::Sequence<sal_Int8>, sal_Int32,TBookmarkPosMapCompare > TBookmarkPosMap;
-
-        class OOO_DLLPUBLIC_ODBCBASE OResultSet :
-                            public	comphelper::OBaseMutex,
-                            public	::connectivity::IResultSetHelper,
-                            public	OResultSet_BASE,
-                            public	::cppu::OPropertySetHelper,
-                            public	::comphelper::OPropertyArrayUsageHelper<OResultSet>
-        {
-        protected:
-            TBookmarkPosMap								m_aPosToBookmarks;
-            // used top hold the information about the value and the datatype to save calls to metadata
-            typedef ::std::vector<ORowSetValue>			TDataRow;
-
-            TVoidVector									m_aBindVector;
-            ::std::vector<SQLLEN>						m_aLengthVector;
-            ::std::map<sal_Int32,SWORD>					m_aODBCColumnTypes;
-            ::com::sun::star::uno::Sequence<sal_Int8>	m_aBookmark;
-
-            TDataRow									m_aRow; // only used when SQLGetData can't be called in any order
-            ORowSetValue								m_aEmptyValue;	// needed for the getValue method when no prefetch is used
-            SQLHANDLE									m_aStatementHandle;
-            SQLHANDLE									m_aConnectionHandle;
-            OStatement_Base*							m_pStatement;
-            OSkipDeletedSet*							m_pSkipDeletedSet;
-            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>	m_xStatement;
-            ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData>        m_xMetaData;
-            SQLUSMALLINT*								m_pRowStatusArray;
-            rtl_TextEncoding							m_nTextEncoding;
-            sal_Int32									m_nRowPos;
-            sal_Int32									m_nLastColumnPos;		// used for m_aRow just to know where we are
-            mutable sal_uInt32                          m_nUseBookmarks;
-            SQLRETURN									m_nCurrentFetchState;
-            sal_Bool									m_bWasNull;
-            sal_Bool									m_bEOF;					// after last record
-            sal_Bool									m_bLastRecord;
-            sal_Bool									m_bFreeHandle;
-            sal_Bool									m_bInserting;
-            sal_Bool									m_bFetchData;			// true when SQLGetaData can be called in any order or when fetching data for m_aRow
-            sal_Bool									m_bRowInserted;
-            sal_Bool									m_bRowDeleted;
-            sal_Bool									m_bUseFetchScroll;
-
-            sal_Bool  isBookmarkable()			const;
-            sal_Int32 getResultSetConcurrency() const;
-            sal_Int32 getResultSetType()		const;
-            sal_Int32 getFetchDirection()		const;
-            sal_Int32 getFetchSize()			const;
-            ::rtl::OUString getCursorName()		const;
-
-            void setFetchDirection(sal_Int32 _par0);
-            void setFetchSize(sal_Int32 _par0);
-
-
-            void fillRow(sal_Int32 _nToColumn);
-            void allocBuffer();
-            void releaseBuffer();
-            void updateValue(sal_Int32 columnIndex,SQLSMALLINT _nType,void* _pValue) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            void fillNeededData(SQLRETURN _nRet);
-            const ORowSetValue& getValue(sal_Int32 _nColumnIndex,SQLSMALLINT _nType,void* _pValue,SQLINTEGER _rSize);
-            sal_Bool moveImpl(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, sal_Bool _bRetrieveData);
-            TVoidPtr allocBindColumn(sal_Int32 _nType,sal_Int32 _nColumnIndex);
-            SQLRETURN unbind(sal_Bool _bUnbindHandle = sal_True);
-            SWORD impl_getColumnType_nothrow(sal_Int32 columnIndex);
-        
-            // OPropertyArrayUsageHelper
-            virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
-            // OPropertySetHelper
-            virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
-
-            virtual sal_Bool SAL_CALL convertFastPropertyValue(
-                                ::com::sun::star::uno::Any & rConvertedValue,
-                                ::com::sun::star::uno::Any & rOldValue,
-                                sal_Int32 nHandle,
-                                const ::com::sun::star::uno::Any& rValue )
-                                    throw (::com::sun::star::lang::IllegalArgumentException);
-            virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
-                                    sal_Int32 nHandle,
-                                    const ::com::sun::star::uno::Any& rValue
-                                     )
-                                     throw (::com::sun::star::uno::Exception);
-            virtual void SAL_CALL getFastPropertyValue(
-                                    ::com::sun::star::uno::Any& rValue,
-                                    sal_Int32 nHandle
-                                         ) const;
-        public:
-            DECLARE_SERVICE_INFO();
-            // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
-            OResultSet( SQLHANDLE _pStatementHandle,OStatement_Base* pStmt);
-            virtual ~OResultSet();
-
-            void construct();
-
-            inline oslGenericFunction getOdbcFunction(sal_Int32 _nIndex)  const
-            {
-                return m_pStatement->getOdbcFunction(_nIndex);
-            }
-
-            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *()
-            {
-                return ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(*(OResultSet_BASE*)this);
-            }
-
-            inline void setMetaData(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;}
-
-            // ::cppu::OComponentHelper
-            virtual void SAL_CALL disposing(void);
-            // XInterface
-            virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL acquire() throw();
-            virtual void SAL_CALL release() throw();
-            //XTypeProvider
-            virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
-            // XPropertySet
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
-            // XResultSet
-            virtual sal_Bool SAL_CALL next(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL isBeforeFirst(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL isAfterLast(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL isFirst(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL isLast(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL beforeFirst(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL afterLast(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL first(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL last(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL previous(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL refreshRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL rowUpdated(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL rowInserted(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL rowDeleted(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            // XRow
-            virtual sal_Bool SAL_CALL wasNull(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            // XResultSetMetaDataSupplier
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            // XCancellable
-            virtual void SAL_CALL cancel(  ) throw(::com::sun::star::uno::RuntimeException);
-            // XCloseable
-            virtual void SAL_CALL close(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            // XWarningsSupplier
-            virtual ::com::sun::star::uno::Any SAL_CALL getWarnings(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL clearWarnings(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            // XResultSetUpdate
-            virtual void SAL_CALL insertRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL deleteRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL cancelRowUpdates(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL moveToInsertRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL moveToCurrentRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            // XRowUpdate
-            virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            // XColumnLocate
-            virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            // XRowLocate
-            virtual ::com::sun::star::uno::Any SAL_CALL getBookmark(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL moveToBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL moveRelativeToBookmark( const ::com::sun::star::uno::Any& bookmark, sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL compareBookmarks( const ::com::sun::star::uno::Any& first, const ::com::sun::star::uno::Any& second ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL hasOrderedBookmarks(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL hashBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            // XDeleteRows
-            virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-
-            // IResultSetHelper
-            virtual sal_Bool move(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, sal_Bool _bRetrieveData);
-            virtual sal_Int32 getDriverPos() const;
-            virtual sal_Bool deletedVisible() const;
-            virtual sal_Bool isRowDeleted() const;
-
-        protected:
-            using OPropertySetHelper::getFastPropertyValue;
-        };
-    }
-}
-#endif // _CONNECTIVITY_ODBC_ORESULTSET_HXX_
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
deleted file mode 100644
index 86e2441d38..0000000000
--- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx
+++ /dev/null
@@ -1,128 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _CONNECTIVITY_ODBC_ORESULTSETMETADATA_HXX_
-#define _CONNECTIVITY_ODBC_ORESULTSETMETADATA_HXX_
-
-#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include "odbc/OFunctions.hxx"
-#include "odbc/odbcbasedllapi.hxx"
-#ifndef _VECTOR_
-#include <vector>
-#endif
-#include "odbc/OConnection.hxx"
-
-namespace connectivity
-{
-    namespace odbc
-    {
-        //**************************************************************
-        //************ Class: ResultSetMetaData
-        //**************************************************************
-        typedef ::cppu::WeakImplHelper1<        ::com::sun::star::sdbc::XResultSetMetaData>   OResultSetMetaData_BASE;
-
-        class OOO_DLLPUBLIC_ODBCBASE OResultSetMetaData :
-            public 	OResultSetMetaData_BASE
-        {
-        protected:
-            ::std::vector<sal_Int32> m_vMapping; // when not every column is needed
-            ::std::map<sal_Int32,sal_Int32> m_aColumnTypes;
-
-            SQLHANDLE		m_aStatementHandle;
-            OConnection*	m_pConnection;
-            sal_Int32		m_nColCount;
-            sal_Bool		m_bUseODBC2Types;
-
-            ::rtl::OUString getCharColAttrib(sal_Int32 column,sal_Int32 ident) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            sal_Int32 getNumColAttrib(sal_Int32 column,sal_Int32 ident) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-        public:
-            // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
-            OResultSetMetaData(OConnection*	_pConnection, SQLHANDLE _pStmt )
-                :m_aStatementHandle( _pStmt )
-                ,m_pConnection(_pConnection)
-                ,m_nColCount(-1)
-                ,m_bUseODBC2Types(sal_False)
-            {}
-            OResultSetMetaData(OConnection*	_pConnection, SQLHANDLE _pStmt ,const ::std::vector<sal_Int32> & _vMapping)
-                    :m_vMapping(_vMapping)
-                    ,m_aStatementHandle( _pStmt )
-                    ,m_pConnection(_pConnection)
-                    ,m_nColCount(_vMapping.size()-1)
-                    ,m_bUseODBC2Types(sal_False)
-            {}
-            virtual ~OResultSetMetaData();
-
-
-            static SQLLEN getNumColAttrib(OConnection* _pConnection
-                                              ,SQLHANDLE _aStatementHandle
-                                              ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
-                                              ,sal_Int32 _column
-                                              ,sal_Int32 ident) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-
-            static SQLSMALLINT getColumnODBCType(OConnection* _pConnection
-                                              ,SQLHANDLE _aStatementHandle
-                                              ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
-                                              ,sal_Int32 column)
-                                               throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-
-            inline oslGenericFunction getOdbcFunction(sal_Int32 _nIndex)  const
-            {
-                return m_pConnection->getOdbcFunction(_nIndex);
-            }
-            /// Avoid ambigous cast error from the compiler.
-            inline operator ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > () throw()
-            { return this; }
-
-            virtual sal_Int32 SAL_CALL getColumnCount(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-        };
-    }
-}
-#endif // _CONNECTIVITY_ODBC_ORESULTSETMETADATA_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx
deleted file mode 100644
index 97a1254e18..0000000000
--- a/connectivity/source/inc/odbc/OStatement.hxx
+++ /dev/null
@@ -1,250 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _CONNECTIVITY_ODBC_OSTATEMENT_HXX_
-#define _CONNECTIVITY_ODBC_OSTATEMENT_HXX_
-
-#include <com/sun/star/sdbc/XStatement.hpp>
-#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
-#include <com/sun/star/sdbc/XMultipleResults.hpp>
-#include <com/sun/star/sdbc/XBatchExecution.hpp>
-#include <com/sun/star/sdbc/XCloseable.hpp>
-#include <com/sun/star/sdbc/SQLWarning.hpp>
-#include <com/sun/star/sdbc/XGeneratedResultSet.hpp>
-#include <com/sun/star/util/XCancellable.hpp>
-#include <comphelper/proparrhlp.hxx>
-#include <cppuhelper/compbase6.hxx>
-#include <comphelper/uno3.hxx>
-#include "connectivity/CommonTools.hxx"
-#include "odbc/OFunctions.hxx"
-#include "odbc/OConnection.hxx"
-#include "odbc/odbcbasedllapi.hxx"
-#include <list>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <comphelper/broadcasthelper.hxx>
-
-namespace connectivity
-{
-    namespace odbc
-    {
-
-        typedef ::cppu::WeakComponentImplHelper6<	::com::sun::star::sdbc::XStatement,
-                                                    ::com::sun::star::sdbc::XWarningsSupplier,
-                                                    ::com::sun::star::util::XCancellable,
-                                                    ::com::sun::star::sdbc::XCloseable,
-                                                    ::com::sun::star::sdbc::XGeneratedResultSet,
-                                                    ::com::sun::star::sdbc::XMultipleResults> OStatement_BASE;
-
-        class OResultSet;
-        //**************************************************************
-        //************ Class: java.sql.Statement
-        //**************************************************************
-        class OOO_DLLPUBLIC_ODBCBASE OStatement_Base :
-                                        public comphelper::OBaseMutex,
-                                        public	OStatement_BASE,
-                                        public	::cppu::OPropertySetHelper,
-                                        public	::comphelper::OPropertyArrayUsageHelper<OStatement_Base>
-
-        {
-        ::com::sun::star::sdbc::SQLWarning                                           m_aLastWarning;
-        protected:
-            ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XResultSet>   m_xResultSet;   // The last ResultSet created
-            ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement>		m_xGeneratedStatement;
-            //  for this Statement
-
-            ::std::list< ::rtl::OUString>	m_aBatchList;
-            ::rtl::OUString					m_sSqlStatement;
-
-            OConnection*					m_pConnection;// The owning Connection object
-            SQLHANDLE						m_aStatementHandle;
-            SQLUSMALLINT*					m_pRowStatusArray;
-            ::cppu::OBroadcastHelper&       rBHelper;
-
-        protected:
-
-            sal_Int32 getQueryTimeOut()         const;
-            sal_Int32 getMaxFieldSize()         const;
-            sal_Int32 getMaxRows()              const;
-            sal_Int32 getResultSetConcurrency()	const;
-            sal_Int32 getResultSetType()        const;
-            sal_Int32 getFetchDirection()       const;
-            sal_Int32 getFetchSize()            const;
-            ::rtl::OUString getCursorName()     const;
-            sal_Bool isUsingBookmarks()			const;
-            sal_Bool getEscapeProcessing()      const;
-            sal_Int32 getStmtOption (short fOption) const;
-
-            void setQueryTimeOut(sal_Int32 _par0)			;
-            void setMaxFieldSize(sal_Int32 _par0)			;
-            void setMaxRows(sal_Int32 _par0)				;
-            void setFetchDirection(sal_Int32 _par0)			;
-            void setFetchSize(sal_Int32 _par0)				;
-            void setCursorName(const ::rtl::OUString &_par0);
-            void setEscapeProcessing( const sal_Bool _bEscapeProc );
-
-            virtual void setResultSetConcurrency(sal_Int32 _par0)	;
-            virtual void setResultSetType(sal_Int32 _par0)			;
-            virtual void setUsingBookmarks(sal_Bool _bUseBookmark)	;
-
-            void reset () throw( ::com::sun::star::sdbc::SQLException);
-            void clearMyResultSet () throw( ::com::sun::star::sdbc::SQLException);
-            void setWarning (const  ::com::sun::star::sdbc::SQLWarning &ex) throw( ::com::sun::star::sdbc::SQLException);
-            sal_Bool lockIfNecessary (const ::rtl::OUString& sql) throw( ::com::sun::star::sdbc::SQLException);
-            sal_Int32 getColumnCount () throw( ::com::sun::star::sdbc::SQLException);
-
-            //--------------------------------------------------------------------
-            // getResultSet
-            // getResultSet returns the current result as a ResultSet.  It
-            // returns NULL if the current result is not a ResultSet.
-            //--------------------------------------------------------------------
-            ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > getResultSet (sal_Bool checkCount) throw( ::com::sun::star::sdbc::SQLException);
-            /**
-                creates the driver specific resultset (factory)
-            */
-            virtual OResultSet* createResulSet();
-
-            SQLLEN getRowCount () throw( ::com::sun::star::sdbc::SQLException);
-
-
-            void disposeResultSet();
-
-            // OPropertyArrayUsageHelper
-            virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
-            // OPropertySetHelper
-            virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
-            virtual sal_Bool SAL_CALL convertFastPropertyValue(
-                                ::com::sun::star::uno::Any & rConvertedValue,
-                                ::com::sun::star::uno::Any & rOldValue,
-                                sal_Int32 nHandle,
-                                const ::com::sun::star::uno::Any& rValue )
-                            throw (::com::sun::star::lang::IllegalArgumentException);
-            virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
-                                    sal_Int32 nHandle,
-                                    const ::com::sun::star::uno::Any& rValue
-                                                     )
-                                 throw (::com::sun::star::uno::Exception);
-            virtual void SAL_CALL getFastPropertyValue(
-                                    ::com::sun::star::uno::Any& rValue,
-                                    sal_Int32 nHandle
-                                         ) const;
-            virtual ~OStatement_Base();
-
-        public:
-            OStatement_Base(OConnection* _pConnection );
-            using OStatement_BASE::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >;
-
-            inline oslGenericFunction getOdbcFunction(sal_Int32 _nIndex)  const
-            {
-                return m_pConnection->getOdbcFunction(_nIndex);
-            }
-            // OComponentHelper
-            virtual void SAL_CALL disposing(void);
-            // XInterface
-            virtual void SAL_CALL release() throw();
-            virtual void SAL_CALL acquire() throw();
-            // XInterface
-            virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-            //XTypeProvider
-            virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
-
-            // XPropertySet
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
-            // XStatement
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ;
-            virtual sal_Int32 SAL_CALL executeUpdate( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ;
-            virtual sal_Bool SAL_CALL execute( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ;
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ;
-            // XWarningsSupplier
-            virtual ::com::sun::star::uno::Any SAL_CALL getWarnings(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL clearWarnings(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            // XCancellable
-            virtual void SAL_CALL cancel(  ) throw(::com::sun::star::uno::RuntimeException);
-            // XCloseable
-            virtual void SAL_CALL close(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            // XMultipleResults
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getResultSet(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getUpdateCount(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL getMoreResults(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            //XGeneratedResultSet
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getGeneratedValues(  ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-
-            // other methods
-            SQLHANDLE getConnectionHandle() { return m_pConnection->getConnection(); }
-            OConnection* getOwnConnection() const { return m_pConnection;}
-            /** getCursorProperties return the properties for a specific cursor type
-                @param _nCursorType		the CursorType
-                @param bFirst			when true the first property set is returned
-
-                @return the cursor properties
-            */
-            SQLUINTEGER getCursorProperties(SQLINTEGER _nCursorType,sal_Bool bFirst);
-
-        protected:
-            using OPropertySetHelper::getFastPropertyValue;
-        };
-
-        class OOO_DLLPUBLIC_ODBCBASE OStatement_BASE2 :
-                                 public OStatement_Base
-                                ,public ::connectivity::OSubComponent<OStatement_BASE2, OStatement_BASE>
-
-        {
-            friend class OSubComponent<OStatement_BASE2, OStatement_BASE>;
-        public:
-            OStatement_BASE2(OConnection* _pConnection ) :  OStatement_Base(_pConnection ),
-                                    ::connectivity::OSubComponent<OStatement_BASE2, OStatement_BASE>((::cppu::OWeakObject*)_pConnection, this){}
-            // OComponentHelper
-            virtual void SAL_CALL disposing(void);
-            // XInterface
-            virtual void SAL_CALL release() throw();
-        };
-
-        class OOO_DLLPUBLIC_ODBCBASE OStatement :
-                            public OStatement_BASE2,
-                            public ::com::sun::star::sdbc::XBatchExecution,
-                            public ::com::sun::star::lang::XServiceInfo
-        {
-        protected:
-            virtual ~OStatement(){}
-        public:
-            // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
-            OStatement( OConnection* _pConnection) : OStatement_BASE2( _pConnection){}
-            DECLARE_SERVICE_INFO();
-
-            virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL acquire() throw();
-            virtual void SAL_CALL release() throw();
-            // XBatchExecution
-            virtual void SAL_CALL addBatch( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL clearBatch(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-        };
-    }
-}
-#endif // _CONNECTIVITY_ODBC_OSTATEMENT_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/odbc/OTools.hxx b/connectivity/source/inc/odbc/OTools.hxx
deleted file mode 100644
index e493cec454..0000000000
--- a/connectivity/source/inc/odbc/OTools.hxx
+++ /dev/null
@@ -1,278 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _CONNECTIVITY_OTOOLS_HXX_
-#define _CONNECTIVITY_OTOOLS_HXX_
-
-#include "odbc/OFunctiondefs.hxx"
-#include "odbc/odbcbasedllapi.hxx"
-#include <com/sun/star/sdbc/SQLException.hpp>
-#include <com/sun/star/util/Date.hpp>
-#include <com/sun/star/util/Time.hpp>
-#include <com/sun/star/util/DateTime.hpp>
-#include <osl/thread.h>
-#include <rtl/ustring.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <rtl/textenc.h>
-
-#define ODBC3SQLAllocHandle 		1
-#define ODBC3SQLConnect 			2
-#define ODBC3SQLDriverConnect 		3
-#define ODBC3SQLBrowseConnect 		4
-#define ODBC3SQLDataSources 		5
-#define ODBC3SQLDrivers 			6
-#define ODBC3SQLGetInfo 			7
-#define ODBC3SQLGetFunctions 		8
-#define ODBC3SQLGetTypeInfo 		9
-#define ODBC3SQLSetConnectAttr 		10
-#define ODBC3SQLGetConnectAttr 		11
-#define ODBC3SQLSetEnvAttr 			12
-#define ODBC3SQLGetEnvAttr 			13
-#define ODBC3SQLSetStmtAttr 		14
-#define ODBC3SQLGetStmtAttr 		15
-#define ODBC3SQLPrepare 			16
-#define ODBC3SQLBindParameter 		17
-#define ODBC3SQLSetCursorName 		18
-#define ODBC3SQLExecute 			19
-#define ODBC3SQLExecDirect 			20
-#define ODBC3SQLDescribeParam 		21
-#define ODBC3SQLNumParams 			22
-#define ODBC3SQLParamData 			23
-#define ODBC3SQLPutData 			24
-#define ODBC3SQLRowCount 			25
-#define ODBC3SQLNumResultCols 		26
-#define ODBC3SQLDescribeCol 		27
-#define ODBC3SQLColAttribute 		28
-#define ODBC3SQLBindCol 			29
-#define ODBC3SQLFetch 				30
-#define ODBC3SQLFetchScroll 		31
-#define ODBC3SQLGetData 			32
-#define ODBC3SQLSetPos 				33
-#define ODBC3SQLBulkOperations 		34
-#define ODBC3SQLMoreResults 		35
-#define ODBC3SQLGetDiagRec 			36
-#define ODBC3SQLColumnPrivileges 	37
-#define ODBC3SQLColumns 			38
-#define ODBC3SQLForeignKeys 		39
-#define ODBC3SQLPrimaryKeys 		40
-#define ODBC3SQLProcedureColumns 	41
-#define ODBC3SQLProcedures 			42
-#define ODBC3SQLSpecialColumns 		43
-#define ODBC3SQLStatistics 			44
-#define ODBC3SQLTablePrivileges 	45
-#define ODBC3SQLTables 				46
-#define ODBC3SQLFreeStmt 			47
-#define ODBC3SQLCloseCursor 		48
-#define ODBC3SQLCancel 				49
-#define ODBC3SQLEndTran 			50
-#define ODBC3SQLDisconnect 			51
-#define ODBC3SQLFreeHandle 			52
-#define ODBC3SQLGetCursorName 		53
-#define ODBC3SQLNativeSql 			54
-
-namespace connectivity
-{
-    namespace odbc
-    {
-        class OConnection;
-
-        const sal_uInt32 ODBC_FRACTION_UNITS_PER_HSECOND = 10000000L;
-        const sal_Int32	MAX_PUT_DATA_LENGTH = 2000;
-
-        class OOO_DLLPUBLIC_ODBCBASE OTools
-        {
-        public:
-            static void ThrowException(	OConnection* _pConnection,	
-                                        SQLRETURN _rRetCode,
-                                        SQLHANDLE _pContext,
-                                        SQLSMALLINT _nHandleType,
-                                        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
-                                        sal_Bool _bNoFound=sal_True,
-                                        rtl_TextEncoding _nTextEncoding = RTL_TEXTENCODING_MS_1252)
-                                        throw(::com::sun::star::sdbc::SQLException);
-
-            static void GetInfo(OConnection* _pConnection,	
-                                SQLHANDLE _aConnectionHandle,
-                                SQLUSMALLINT _nInfo,
-                                ::rtl::OUString &_rValue,
-                                const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
-                                rtl_TextEncoding _nTextEncoding)
-                                throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-
-            static void GetInfo(OConnection* _pConnection,
-                                SQLHANDLE _aConnectionHandle,
-                                SQLUSMALLINT _nInfo,
-                                sal_Int32 &_rValue,
-                                const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-
-            static void GetInfo(OConnection* _pConnection,
-                                SQLHANDLE _aConnectionHandle,
-                                SQLUSMALLINT _nInfo,
-                                SQLUSMALLINT &_rValue,
-                                const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-
-            static void GetInfo(OConnection* _pConnection,
-                                SQLHANDLE _aConnectionHandle,
-                                SQLUSMALLINT _nInfo,
-                                SQLUINTEGER &_rValue,
-                                const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-                        
-            static void GetInfo(OConnection* _pConnection,
-                                SQLHANDLE _aConnectionHandle,
-                                SQLUSMALLINT _nInfo,
-                                sal_Bool &_rValue,
-                                const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-
-            static sal_Int32 MapOdbcType2Jdbc(sal_Int32 _nType);
-            static sal_Int32 jdbcTypeToOdbc(sal_Int32 jdbcType);
-
-            static DATE_STRUCT DateToOdbcDate(const ::com::sun::star::util::Date& x)
-            {
-                DATE_STRUCT aVal;
-                aVal.year	= x.Year;
-                aVal.month	= x.Month;
-                aVal.day	= x.Day;
-                return aVal;
-            }
-            static TIME_STRUCT TimeToOdbcTime(const ::com::sun::star::util::Time& x)
-            {
-                TIME_STRUCT aVal;
-                aVal.hour	= x.Hours;
-                aVal.minute	= x.Minutes;
-                aVal.second	= x.Seconds;
-                return aVal;
-            }
-            static TIMESTAMP_STRUCT DateTimeToTimestamp(const ::com::sun::star::util::DateTime& x)
-            {
-                TIMESTAMP_STRUCT aVal;
-                aVal.year		= x.Year;
-                aVal.month		= x.Month;
-                aVal.day		= x.Day;
-                aVal.hour		= x.Hours;
-                aVal.minute		= x.Minutes;
-                aVal.second		= x.Seconds;
-                aVal.fraction	= x.HundredthSeconds * ODBC_FRACTION_UNITS_PER_HSECOND;
-                return aVal;
-            }
-            /** 
-                getBindTypes set the ODBC type for C
-                @param	_bUseWChar			true when Unicode should be used
-                @param	_bUseOldTimeDate	true when the old datetime format should be used
-                @param	_nOdbcType			the ODBC sql type
-                @param	fCType				the C type for the ODBC type
-                @param	fSqlType			the SQL type for the ODBC type
-            */
-            static void getBindTypes(sal_Bool _bUseWChar,
-                                     sal_Bool _bUseOldTimeDate,
-                                     SQLSMALLINT _nOdbcType,
-                                     SQLSMALLINT& fCType,
-                                     SQLSMALLINT& fSqlType);
-
-            static ::rtl::OUString getStringValue(	OConnection* _pConnection,	
-                                                    SQLHANDLE _aStatementHandle,
-                                                    sal_Int32 columnIndex,
-                                                    SQLSMALLINT _fSqlType,
-                                                    sal_Bool &_bWasNull,
-                                                    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
-                                                    rtl_TextEncoding _nTextEncoding) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-
-            static  ::com::sun::star::uno::Sequence<sal_Int8> getBytesValue(OConnection* _pConnection,	
-                                                                            SQLHANDLE _aStatementHandle,
-                                                                            sal_Int32 columnIndex,
-                                                                            SQLSMALLINT _fSqlType,
-                                                                            sal_Bool &_bWasNull,
-                                                                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            static void getValue(	OConnection* _pConnection,	
-                                    SQLHANDLE _aStatementHandle,
-                                    sal_Int32 columnIndex,
-                                    SQLSMALLINT _nType,
-                                    sal_Bool &_bWasNull,
-                                    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
-                                    void* _pValue,
-                                    SQLLEN _nSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-
-            /** 
-                bindData copies the from pValue to pData
-                @param	_nOdbcType			the ODBC sql type
-                @param	_bUseWChar			true when Unicode should be used
-                @param	_pData				contains a copy of the data to be set
-                @param	_pValue				contains the data to be copied
-                @param	_nTextEncoding		the text encoding
-                @param	_nColumnSize		the columnsize which is a out param
-            */
-            static void bindData(	SQLSMALLINT _nOdbcType,
-                                    sal_Bool _bUseWChar,
-                                    sal_Int8 *&_pData,
-                                    SQLLEN*& pLen,
-                                    const void* _pValue,
-                                    rtl_TextEncoding _nTextEncoding,
-                                    SQLULEN& _nColumnSize);
-
-            static void bindParameter(	OConnection* _pConnection,	
-                                        SQLHANDLE _hStmt,
-                                        sal_Int32 nPos, 
-                                        sal_Int8*& pDataBuffer,
-                                        sal_Int8* pLenBuffer,
-                                        SQLSMALLINT _nJDBCtype,
-                                        sal_Bool _bUseWChar,
-                                        sal_Bool _bUseOldTimeDate,
-                                        const void* _pValue,
-                                        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
-                                        rtl_TextEncoding _nTextEncoding)
-                                         throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-
-            static void bindValue(	OConnection* _pConnection,	
-                                    SQLHANDLE _aStatementHandle,
-                                    sal_Int32 columnIndex,
-                                    SQLSMALLINT _nType,
-                                    SQLSMALLINT _nMaxLen,
-                                    const void* _pValue,
-                                    void*		_pData,
-                                    SQLLEN *pLen,
-                                    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
-                                    rtl_TextEncoding _nTextEncoding,
-                                    sal_Bool _bUseOldTimeDate) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-        };
-
-        template <class T> void getValue(	OConnection* _pConnection,	
-                                            SQLHANDLE _aStatementHandle,
-                                            sal_Int32 columnIndex,
-                                            SQLSMALLINT _nType,
-                                            sal_Bool &_bWasNull,
-                                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
-                                            T& _rValue) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
-        {
-            OTools::getValue(_pConnection,_aStatementHandle,columnIndex,_nType,_bWasNull,_xInterface,&_rValue,sizeof _rValue);			
-        }
-        //-----------------------------------------------------------------------------
-
-        
-    }
-}
-#endif // _CONNECTIVITY_OTOOLS_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/odbc/odbcbasedllapi.hxx b/connectivity/source/inc/odbc/odbcbasedllapi.hxx
deleted file mode 100644
index 31ac8636e6..0000000000
--- a/connectivity/source/inc/odbc/odbcbasedllapi.hxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_ODBCBASEDLLAPI_HXX
-#define INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_ODBCBASEDLLAPI_HXX
-
-#include "sal/config.h"
-
-#include "sal/types.h"
-
-#if defined OOO_DLLIMPLEMENTATION_ODBCBASE
-#define OOO_DLLPUBLIC_ODBCBASE SAL_DLLPUBLIC_EXPORT
-#else
-#define OOO_DLLPUBLIC_ODBCBASE SAL_DLLPUBLIC_IMPORT
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */