diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2020-02-21 08:06:51 +0100 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2020-03-17 14:04:23 +0100 |
| commit | 2898943ed765290e2c58f8dd84053b4ef9ac158e (patch) | |
| tree | 847f9f01f5aba01e089ea338d318a17f67b85d75 /dbaccess | |
| parent | 35d451044f2873a9e9f566044cd4ab26b6dfbab0 (diff) | |
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@yahoo.fr>
(cherry picked from commit dc3c6e64650f0347648598dae0fa67c296ad36f5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89132
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/dlg/generalpage.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
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 ); } } |