diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2020-02-21 08:06:51 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2020-02-21 09:44:42 +0100 |
| commit | dc3c6e64650f0347648598dae0fa67c296ad36f5 (patch) | |
| tree | 830a3202455b463dfb65832d5f04fa04662f7bfe | |
| parent | 8163f4ad81487ae187d00d3ce86214e520cb8b69 (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>
| -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 b94b63e9f24a..fa379c8d79ef 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -42,6 +42,7 @@ #include <unotools/confignode.hxx> #include <o3tl/safeint.hxx> #include <osl/diagnose.h> +#include <svtools/miscopt.hxx> #include <sal/log.hxx> #include <dbwizsetup.hxx> @@ -147,6 +148,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 @@ -159,6 +163,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 ); } } |