diff options
| author | Tamas Bunth <tamas.bunth@collabora.co.uk> | 2018-04-08 22:54:38 +0200 |
|---|---|---|
| committer | Tamás Bunth <btomi96@gmail.com> | 2018-04-10 11:34:35 +0200 |
| commit | 8d381ae8d6c742a7e15bf7ad9e07b65f81728ef6 (patch) | |
| tree | 208efa413476624cffa4b7e504078761dfeb1a0f /connectivity/source/commontools | |
| parent | tdf#116555 filter: make sure default extension for HTML is not .xhtml (diff) | |
| download | core-8d381ae8d6c742a7e15bf7ad9e07b65f81728ef6.tar.gz core-8d381ae8d6c742a7e15bf7ad9e07b65f81728ef6.zip | |
Remove dead HSQLDB driver
Change-Id: Id4cfb69079f0150c9cca2626c16df7fab441d916
Reviewed-on: https://gerrit.libreoffice.org/52611
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Bunth <btomi96@gmail.com>
Diffstat (limited to 'connectivity/source/commontools')
| -rw-r--r-- | connectivity/source/commontools/DriversConfig.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/connectivity/source/commontools/DriversConfig.cxx b/connectivity/source/commontools/DriversConfig.cxx index a6b78b0d0330..29f5b22de880 100644 --- a/connectivity/source/commontools/DriversConfig.cxx +++ b/connectivity/source/commontools/DriversConfig.cxx @@ -76,6 +76,7 @@ namespace OUString sDriverTypeDisplayName; aURLPatternNode.getNodeValue("DriverTypeDisplayName") >>= sDriverTypeDisplayName; + OSL_ENSURE(!sDriverTypeDisplayName.isEmpty(),"No valid DriverTypeDisplayName property!"); if ( !sDriverTypeDisplayName.isEmpty() ) _rInstalledDriver.sDriverTypeDisplayName = sDriverTypeDisplayName; @@ -112,9 +113,7 @@ const TInstalledDrivers& DriversConfigImpl::getInstalledDrivers(const uno::Refer { TInstalledDriver aInstalledDriver; lcl_readURLPatternNode(m_aInstalled,*pPatternIter,aInstalledDriver); - if ( !aInstalledDriver.sDriverFactory.isEmpty() && - ( aMiscOptions.IsExperimentalMode() || - aInstalledDriver.sDriverFactory != "com.sun.star.comp.sdbc.firebird.Driver" )) + if ( !aInstalledDriver.sDriverFactory.isEmpty() ) m_aDrivers.emplace(*pPatternIter,aInstalledDriver); } } // if ( m_aInstalled.isValid() ) |