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

[Julien Nabet (via logerrit)]

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

New commits:
commit 5e3cb1833da113d6ec09001e7e365d24bd4289ee
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Fri Feb 21 08:06:51 2020 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Thu Apr 9 16:09:27 2020 +0200

    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 <serval2412 at yahoo.fr>
    (cherry picked from commit dc3c6e64650f0347648598dae0fa67c296ad36f5)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89132
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit 2898943ed765290e2c58f8dd84053b4ef9ac158e)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90629
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 5da530c6b201..5f205634b497 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -42,6 +42,7 @@
 #include <comphelper/processfactory.hxx>
 #include <unotools/confignode.hxx>
 #include <osl/diagnose.h>
+#include <svtools/miscopt.hxx>
 #include <sal/log.hxx>
 
 namespace dbaui
@@ -157,6 +158,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
@@ -169,6 +173,8 @@ namespace dbaui
                         if ( m_pEmbeddedDBType->GetEntryPos( sDisplayName ) == LISTBOX_ENTRY_NOTFOUND
                             && dbaccess::ODsnTypeCollection::isEmbeddedDatabase( sURLPrefix ) )
                         {
+                            if( !aMiscOptions.IsExperimentalMode() && sURLPrefix.startsWith("sdbc:embedded:firebird") )
+                                continue;
                             aDisplayedTypes.emplace_back( sURLPrefix, sDisplayName );
                         }
                     }