[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - dbaccess/source

[Julien Nabet (via logerrit)]

 dbaccess/source/ui/dlg/generalpage.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 2898943ed765290e2c58f8dd84053b4ef9ac158e
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Fri Feb 21 08:06:51 2020 +0100
Commit:     Xisco Faulí <xiscofa...@libreoffice.org>
CommitDate: Tue Mar 17 14:04:23 2020 +0100

    Set Firebird creation option experimental
    
    See:
    
http://document-foundation-mail-archive.969070.n3.nabble.com/About-putting-Firebird-creation-option-experimental-tt4274028.html
    
http://document-foundation-mail-archive.969070.n3.nabble.com/ESC-meeting-minutes-2020-02-20-tt4274082.html
    for rationale
    
    Change-Id: I73d1563575252ebbcfb764753294bceb29e9bf12
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89167
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
    (cherry picked from commit dc3c6e64650f0347648598dae0fa67c296ad36f5)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89132
    Reviewed-by: Michael Stahl <michael.st...@cib.de>
    Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>

diff --git a/dbaccess/source/ui/dlg/generalpage.cxx 
b/dbaccess/source/ui/dlg/generalpage.cxx
index cf564821fcf0..31bed5505d5c 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -41,6 +41,7 @@
 #include <comphelper/processfactory.hxx>
 #include <unotools/confignode.hxx>
 #include <osl/diagnose.h>
+#include <svtools/miscopt.hxx>
 #include <sal/log.hxx>
 #include <dbwizsetup.hxx>
 
@@ -146,6 +147,9 @@ namespace dbaui
                 DisplayedTypes aDisplayedTypes;
 
                 ::dbaccess::ODsnTypeCollection::TypeIterator aEnd = 
m_pCollection->end();
+
+                SvtMiscOptions aMiscOptions;
+
                 for (   ::dbaccess::ODsnTypeCollection::TypeIterator aTypeLoop 
=  m_pCollection->begin();
                         aTypeLoop != aEnd;
                         ++aTypeLoop
@@ -158,6 +162,8 @@ namespace dbaui
                         if (m_xEmbeddedDBType->find_text(sDisplayName) == -1 &&
                             
dbaccess::ODsnTypeCollection::isEmbeddedDatabase(sURLPrefix))
                         {
+                            if( !aMiscOptions.IsExperimentalMode() && 
sURLPrefix.startsWith("sdbc:embedded:firebird") )
+                                continue;
                             aDisplayedTypes.emplace_back( sURLPrefix, 
sDisplayName );
                         }
                     }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits