summaryrefslogtreecommitdiff
path: root/connectivity/source/manager
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity/source/manager')
-rw-r--r--connectivity/source/manager/makefile.mk3
-rw-r--r--connectivity/source/manager/mdrivermanager.cxx49
-rw-r--r--connectivity/source/manager/mdrivermanager.hxx8
-rw-r--r--connectivity/source/manager/mregistration.cxx6
4 files changed, 47 insertions, 19 deletions
diff --git a/connectivity/source/manager/makefile.mk b/connectivity/source/manager/makefile.mk
index ce16b2f887d8..7cb514cd3696 100644
--- a/connectivity/source/manager/makefile.mk
+++ b/connectivity/source/manager/makefile.mk
@@ -35,6 +35,7 @@ PRJNAME=connectivity
TARGET=sdbc
ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
# --- Settings ----------------------------------
.IF "$(DBGUTIL_OJ)"!=""
@@ -62,6 +63,8 @@ SHL1STDLIBS=\
$(CPPULIB) \
$(CPPUHELPERLIB) \
$(COMPHELPERLIB) \
+ $(DBTOOLSLIB) \
+ $(UNOTOOLSLIB) \
$(SALLIB)
SHL1DEPN=
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index 3cc251659854..d62f6294e5f8 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -278,13 +278,26 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) throw(NoSuchElementException, W
}
};
+ /// and STL argorithm compatible predicate comparing a DriverAccess' impl name to a string
+ struct EqualDriverAccessToName : public ::std::binary_function< DriverAccess, ::rtl::OUString, bool >
+ {
+ ::rtl::OUString m_sImplName;
+ EqualDriverAccessToName(const ::rtl::OUString& _sImplName) : m_sImplName(_sImplName){}
+ //.................................................................
+ bool operator()( const DriverAccess& lhs)
+ {
+ return lhs.sImplementationName.equals(m_sImplName);
+ }
+ };
+
//==========================================================================
//= OSDBCDriverManager
//==========================================================================
//--------------------------------------------------------------------------
- OSDBCDriverManager::OSDBCDriverManager( const Reference< XComponentContext >& _rxContext )
+OSDBCDriverManager::OSDBCDriverManager( const Reference< XComponentContext >& _rxContext )
:m_aContext( _rxContext )
,m_aEventLogger( _rxContext, "org.openoffice.logging.sdbc.DriverManager" )
+ ,m_aDriverConfig(m_aContext.getLegacyServiceFactory())
,m_nLoginTimeout(0)
{
// bootstrap all objects supporting the .sdb.Driver service
@@ -375,7 +388,7 @@ void OSDBCDriverManager::bootstrapDrivers()
//--------------------------------------------------------------------------
void OSDBCDriverManager::initializeDriverPrecedence()
{
- if (!m_aDriversBS.size())
+ if ( m_aDriversBS.empty() )
// nothing to do
return;
@@ -420,7 +433,7 @@ void OSDBCDriverManager::initializeDriverPrecedence()
{ // we have a DriverAccess with this impl name
OSL_ENSURE( ::std::distance( aPos.first, aPos.second ) == 1,
- "OSDBCDriverManager::initializeDriverPrecedence: move than one driver with this impl name? How this?" );
+ "OSDBCDriverManager::initializeDriverPrecedence: more than one driver with this impl name? How this?" );
// move the DriverAccess pointed to by aPos.first to the position pointed to by aNoPrefDriversStart
if ( aPos.first != aNoPrefDriversStart )
@@ -686,17 +699,29 @@ Reference< XDriver > OSDBCDriverManager::implGetDriverForURL(const ::rtl::OUStri
Reference< XDriver > xReturn;
{
- // search all bootstrapped drivers
- DriverAccessArrayIterator aPos = ::std::find_if(
- m_aDriversBS.begin(), // begin of search range
- m_aDriversBS.end(), // end of search range
- std::unary_compose< AcceptsURL, ExtractAfterLoad >( AcceptsURL( _rURL ), ExtractAfterLoad() )
- // compose two functors: extract the driver from the access, then ask the resulting driver for acceptance
- );
+ const ::rtl::OUString sDriverFactoryName = m_aDriverConfig.getDriverFactoryName(_rURL);
+
+ EqualDriverAccessToName aEqual(sDriverFactoryName);
+ DriverAccessArray::iterator aFind = ::std::find_if(m_aDriversBS.begin(),m_aDriversBS.end(),aEqual);
+ if ( aFind == m_aDriversBS.end() )
+ {
+ // search all bootstrapped drivers
+ aFind = ::std::find_if(
+ m_aDriversBS.begin(), // begin of search range
+ m_aDriversBS.end(), // end of search range
+ std::unary_compose< AcceptsURL, ExtractAfterLoad >( AcceptsURL( _rURL ), ExtractAfterLoad() )
+ // compose two functors: extract the driver from the access, then ask the resulting driver for acceptance
+ );
+ } // if ( m_aDriversBS.find(sDriverFactoryName ) == m_aDriversBS.end() )
+ else
+ {
+ EnsureDriver aEnsure;
+ aEnsure(*aFind);
+ }
// found something?
- if ( m_aDriversBS.end() != aPos )
- xReturn = aPos->xDriver;
+ if ( m_aDriversBS.end() != aFind )
+ xReturn = aFind->xDriver;
}
if ( !xReturn.is() )
diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx
index fef1e1b82429..369b8260f302 100644
--- a/connectivity/source/manager/mdrivermanager.hxx
+++ b/connectivity/source/manager/mdrivermanager.hxx
@@ -44,6 +44,7 @@
#include <comphelper/logging.hxx>
#include <comphelper/componentcontext.hxx>
#include <osl/mutex.hxx>
+#include "connectivity/DriversConfig.hxx"
namespace drivermanager
{
@@ -81,16 +82,15 @@ namespace drivermanager
::comphelper::EventLogger m_aEventLogger;
DECLARE_STL_VECTOR(DriverAccess, DriverAccessArray);
- DriverAccessArray m_aDriversBS;
+ DriverAccessArray m_aDriversBS;
// for drivers registered at runtime (not bootstrapped) we don't require an XServiceInfo interface,
// so we have to remember their impl-name in another way
DECLARE_STL_USTRINGACCESS_MAP(SdbcDriver, DriverCollection);
DriverCollection m_aDriversRT;
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
- m_xServiceFactory;
- sal_Int32 m_nLoginTimeout;
+ ::connectivity::DriversConfig m_aDriverConfig;
+ sal_Int32 m_nLoginTimeout;
private:
OSDBCDriverManager(
diff --git a/connectivity/source/manager/mregistration.cxx b/connectivity/source/manager/mregistration.cxx
index 89a7507600f7..4a305267df14 100644
--- a/connectivity/source/manager/mregistration.cxx
+++ b/connectivity/source/manager/mregistration.cxx
@@ -48,13 +48,13 @@ extern "C"
{
//---------------------------------------------------------------------------------------
- void SAL_CALL component_getImplementationEnvironment(const sal_Char** _ppEnvTypeName, uno_Environment** /*_ppEnv*/)
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char** _ppEnvTypeName, uno_Environment** /*_ppEnv*/)
{
*_ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//---------------------------------------------------------------------------------------
-sal_Bool SAL_CALL component_writeInfo(void* /*_pServiceManager*/, com::sun::star::registry::XRegistryKey* _pRegistryKey)
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* /*_pServiceManager*/, com::sun::star::registry::XRegistryKey* _pRegistryKey)
{
@@ -86,7 +86,7 @@ sal_Bool SAL_CALL component_writeInfo(void* /*_pServiceManager*/, com::sun::star
}
//---------------------------------------------------------------------------------------
-void* SAL_CALL component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
{
void* pRet = NULL;
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-24 14:37:58 +0000