diff options
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/core/dataaccess/connection.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/dataaccess/datasource.cxx | 7 | ||||
-rw-r--r-- | dbaccess/source/inc/stringconstants.inc | 1 | ||||
-rw-r--r-- | dbaccess/source/ui/uno/copytablewizard.cxx | 9 |
4 files changed, 10 insertions, 9 deletions
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index cab3e3a7f3fa..fcfe2196e778 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -717,7 +717,7 @@ Reference< XTablesSupplier > OConnection::getMasterTables() { Reference<XDatabaseMetaData> xMeta = getMetaData(); if ( xMeta.is() ) - m_xMasterTables = ::dbtools::getDataDefinitionByURLAndConnection( xMeta->getURL(), m_xMasterConnection, m_aContext.getLegacyServiceFactory() ); + m_xMasterTables = ::dbtools::getDataDefinitionByURLAndConnection( xMeta->getURL(), m_xMasterConnection, m_aContext.getUNOContext() ); } catch(const SQLException&) { diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 926c118482a3..611042b636db 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -44,6 +44,7 @@ #include <com/sun/star/sdbc/ConnectionPool.hpp> #include <com/sun/star/sdbc/XDriverAccess.hpp> #include <com/sun/star/sdbc/XDriverManager.hpp> +#include <com/sun/star/sdbc/DriverManager.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/ucb/AuthenticationRequest.hpp> #include <com/sun/star/ucb/XInteractionSupplyAuthentication.hpp> @@ -641,13 +642,13 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const ::rtl::O RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::buildLowLevelConnection" ); Reference< XConnection > xReturn; - Reference< XConnectionPool > xManager; + Reference< XDriverManager > xManager; try { - xManager.set( ConnectionPool::create( m_pImpl->m_aContext.getUNOContext() ) ); + xManager.set( ConnectionPool::create( m_pImpl->m_aContext.getUNOContext() ), UNO_QUERY_THROW ); } catch( const Exception& ) { } if ( !xManager.is() ) // no connection pool installed, fall back to driver manager - xManager.set( m_pImpl->m_aContext.createComponent( "com.sun.star.sdbc.DriverManager" ), UNO_QUERY_THROW ); + xManager.set( DriverManager::create(m_pImpl->m_aContext.getUNOContext() ), UNO_QUERY_THROW ); ::rtl::OUString sUser(_rUid); ::rtl::OUString sPwd(_rPwd); diff --git a/dbaccess/source/inc/stringconstants.inc b/dbaccess/source/inc/stringconstants.inc index 4b1434de4309..390d92dd7541 100644 --- a/dbaccess/source/inc/stringconstants.inc +++ b/dbaccess/source/inc/stringconstants.inc @@ -206,7 +206,6 @@ IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_QUERYDEFINITION, "com.sun.star.sdb.Quer IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBCX_COLUMNS, "com.sun.star.sdbcx.Columns"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBCX_TABLES, "com.sun.star.sdbcx.Tables"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_QUERIES, "com.sun.star.sdb.Queries"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBC_DRIVERMANAGER, "com.sun.star.sdbc.DriverManager"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBCX_INDEXCOLUMN, "com.sun.star.sdbcx.IndexColumn"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBCX_KEYCOLUMN, "com.sun.star.sdbcx.KeyColumn"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_FRAME_DESKTOP, "com.sun.star.frame.Desktop"); diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 15e9cde96d0b..6774f2b81e91 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -52,7 +52,7 @@ #include <com/sun/star/sdbcx/XRowLocate.hpp> #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> #include <com/sun/star/sdb/SQLContext.hpp> -#include <com/sun/star/sdbc/XDriverManager.hpp> +#include <com/sun/star/sdbc/DriverManager.hpp> #include <com/sun/star/sdbc/ConnectionPool.hpp> #include <comphelper/componentcontext.hxx> @@ -131,6 +131,7 @@ namespace dbaui using ::com::sun::star::sdbc::ConnectionPool; using ::com::sun::star::sdbc::XConnectionPool; using ::com::sun::star::sdbc::XDriverManager; + using ::com::sun::star::sdbc::DriverManager; using ::com::sun::star::beans::PropertyValue; /** === end UNO using === **/ namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOperation; @@ -954,13 +955,13 @@ SharedConnection CopyTableWizard::impl_extractConnection_throw( const Reference< if ( xPSI->hasPropertyByName( PROPERTY_CONNECTION_INFO ) ) OSL_VERIFY( _rxDataSourceDescriptor->getPropertyValue( PROPERTY_CONNECTION_INFO ) >>= aConnectionInfo ); - Reference< XConnectionPool > xDriverManager; + Reference< XDriverManager > xDriverManager; try { - xDriverManager.set( ConnectionPool::create( m_aContext.getUNOContext() ) ); + xDriverManager.set( ConnectionPool::create( m_aContext.getUNOContext() ), UNO_QUERY_THROW ); } catch( const Exception& ) { } if ( !xDriverManager.is() ) // no connection pool installed - xDriverManager.set( m_aContext.createComponent( "com.sun.star.sdbc.DriverManager" ), UNO_QUERY_THROW ); + xDriverManager.set( DriverManager::create(m_aContext.getUNOContext() ), UNO_QUERY_THROW ); if ( aConnectionInfo.getLength() ) xConnection.set( xDriverManager->getConnectionWithInfo( sConnectionResource, aConnectionInfo ), UNO_SET_THROW ); |