summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXisco Fauli <xiscofauli@libreoffice.org>2018-04-18 12:18:00 +0200
committerXisco Faulí <xiscofauli@libreoffice.org>2018-04-18 19:50:50 +0200
commit8a1a9899e05b0ebbc3ff43f2db242724c8feb18f (patch)
tree6dbb0042c22b9450255e2a1cbf442fe644cfe474
parent6bf05f004b19b1cc2045556b8dd48ddb2ec3c359 (diff)
tdf#117081: show Firebird by default
Change-Id: I4247b86cdbe332bd6c529b075174e3657fbfa9e1 Reviewed-on: https://gerrit.libreoffice.org/53090 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
-rw-r--r--connectivity/source/commontools/DriversConfig.cxx7
1 files changed, 1 insertions, 6 deletions
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() )