[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - connectivity/source

[Libreoffice Gerrit user]

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

New commits:
commit 88abae93c5e0a030eca36d7e33909ad52e1c71a2
Author:     Xisco Faulí <xiscofa...@libreoffice.org>
AuthorDate: Sat Jul 14 13:22:27 2018 +0200
Commit:     Miklos Vajna <vmik...@collabora.co.uk>
CommitDate: Wed Jul 18 15:39:05 2018 +0200

    tdf#118751: Revert "tdf#117081: show Firebird by default"
    
    Only in 6.1 branch
    
    This reverts commit 8a1a9899e05b0ebbc3ff43f2db242724c8feb18f.
    
    Change-Id: I48c9ce8dc9d45ab243c96e65da8d1b01a9423b5c
    Reviewed-on: https://gerrit.libreoffice.org/57429
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>

diff --git a/connectivity/source/commontools/DriversConfig.cxx 
b/connectivity/source/commontools/DriversConfig.cxx
index 380fe321930b..a6b78b0d0330 100644
--- a/connectivity/source/commontools/DriversConfig.cxx
+++ b/connectivity/source/commontools/DriversConfig.cxx
@@ -18,6 +18,7 @@
  */
 #include <connectivity/DriversConfig.hxx>
 #include <tools/wldcrd.hxx>
+#include <svtools/miscopt.hxx>
 #include <comphelper/sequence.hxx>
 
 using namespace connectivity;
@@ -102,6 +103,8 @@ 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();
@@ -109,7 +112,9 @@ const TInstalledDrivers& 
DriversConfigImpl::getInstalledDrivers(const uno::Refer
             {
                 TInstalledDriver aInstalledDriver;
                 
lcl_readURLPatternNode(m_aInstalled,*pPatternIter,aInstalledDriver);
-                if ( !aInstalledDriver.sDriverFactory.isEmpty() )
+                if ( !aInstalledDriver.sDriverFactory.isEmpty() &&
+                     ( aMiscOptions.IsExperimentalMode() ||
+                       aInstalledDriver.sDriverFactory != 
"com.sun.star.comp.sdbc.firebird.Driver" ))
                     m_aDrivers.emplace(*pPatternIter,aInstalledDriver);
             }
         } // if ( m_aInstalled.isValid() )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits