[Libreoffice-commits] core.git: connectivity/source

[Xisco Fauli]

 connectivity/source/commontools/DriversConfig.cxx |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 8a1a9899e05b0ebbc3ff43f2db242724c8feb18f
Author: Xisco Fauli <xiscofauli at libreoffice.org>
Date:   Wed Apr 18 12:18:00 2018 +0200

    tdf#117081: show Firebird by default
    
    Change-Id: I4247b86cdbe332bd6c529b075174e3657fbfa9e1
    Reviewed-on: https://gerrit.libreoffice.org/53090
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

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() )