connectivity/source/commontools/DriversConfig.cxx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
New commits: commit c957c5a4a0d3f621087b6dab468caaa4ed1a3e39 Author: Xisco Faulí <[email protected]> AuthorDate: Thu Aug 16 10:30:47 2018 +0200 Commit: Miklos Vajna <[email protected]> CommitDate: Thu Aug 16 14:42:02 2018 +0200 Revert "tdf#118751: Revert "tdf#117081: show Firebird by default"" This reverts commit 88abae93c5e0a030eca36d7e33909ad52e1c71a2. Change-Id: Ic51eca2797ad80a976f923c9003fd9751ac165ff Reviewed-on: https://gerrit.libreoffice.org/59158 Tested-by: Jenkins Reviewed-by: Miklos Vajna <[email protected]> diff --git a/connectivity/source/commontools/DriversConfig.cxx b/connectivity/source/commontools/DriversConfig.cxx index a6b78b0d0330..380fe321930b 100644 --- a/connectivity/source/commontools/DriversConfig.cxx +++ b/connectivity/source/commontools/DriversConfig.cxx @@ -18,7 +18,6 @@ */ #include <connectivity/DriversConfig.hxx> #include <tools/wldcrd.hxx> -#include <svtools/miscopt.hxx> #include <comphelper/sequence.hxx> using namespace connectivity; @@ -103,8 +102,6 @@ const TInstalledDrivers& DriversConfigImpl::getInstalledDrivers(const uno::Refer if ( m_aInstalled.isValid() ) { - SvtMiscOptions aMiscOptions; - const uno::Sequence< OUString > aURLPatterns = m_aInstalled.getNodeNames(); const OUString* pPatternIter = aURLPatterns.getConstArray(); const OUString* pPatternEnd = pPatternIter + aURLPatterns.getLength(); @@ -112,9 +109,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() ) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
