diff options
| author | Carsten Driesner <cd@openoffice.org> | 2010-06-24 11:35:00 +0200 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2010-06-24 11:35:00 +0200 |
| commit | 2a40b4b78143f09358c1f319e8608dbd61bbe2d6 (patch) | |
| tree | 60668145121dc3e45a60d569f9c2947afda15e30 /connectivity/source/manager | |
| parent | 2b1c9f5c63f4d90db0137b1c8c91340bb2559115 (diff) | |
| parent | 34dd33af79caf3a13ec3a4e7098616ac0b16cf50 (diff) | |
Merge changes
Diffstat (limited to 'connectivity/source/manager')
| -rw-r--r-- | connectivity/source/manager/makefile.mk | 2 | ||||
| -rw-r--r-- | connectivity/source/manager/mdrivermanager.cxx | 2 | ||||
| -rw-r--r-- | connectivity/source/manager/sdbc.map | 8 |
3 files changed, 2 insertions, 10 deletions
diff --git a/connectivity/source/manager/makefile.mk b/connectivity/source/manager/makefile.mk index e72dfc78bcdfa..52ec191ec8360 100644 --- a/connectivity/source/manager/makefile.mk +++ b/connectivity/source/manager/makefile.mk @@ -52,7 +52,7 @@ SLOFILES=\ SHL1TARGET= $(SDBC_TARGET)$(SDBC_MAJOR) -SHL1VERSIONMAP=$(TARGET).map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx index 77bef5a3dc830..a88450399c174 100644 --- a/connectivity/source/manager/mdrivermanager.cxx +++ b/connectivity/source/manager/mdrivermanager.cxx @@ -717,7 +717,7 @@ Reference< XDriver > OSDBCDriverManager::implGetDriverForURL(const ::rtl::OUStri } // found something? - if ( m_aDriversBS.end() != aFind ) + if ( m_aDriversBS.end() != aFind && aFind->xDriver.is() && aFind->xDriver->acceptsURL(_rURL) ) xReturn = aFind->xDriver; } diff --git a/connectivity/source/manager/sdbc.map b/connectivity/source/manager/sdbc.map deleted file mode 100644 index 2d8534b22e219..0000000000000 --- a/connectivity/source/manager/sdbc.map +++ /dev/null @@ -1,8 +0,0 @@ -SDBC_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; |