diff options
| author | Tamas Bunth <tamas.bunth@collabora.co.uk> | 2018-04-23 22:34:00 +0200 |
|---|---|---|
| committer | Tamás Bunth <btomi96@gmail.com> | 2018-04-26 13:13:51 +0200 |
| commit | 60db3d2cc3bc4f124bd4d819fbd0285e7f19c8c4 (patch) | |
| tree | ae7a3571ad19d051f5f682085fcf37451077597f /dbaccess | |
| parent | ea1dde9e899dc26f0b877ff5fc5f8d027769521b (diff) | |
dbu: Set Firebird to default in wizard..
..in case experimental feature is checked in.
Change-Id: I8a774d4e532ea2afc0e1fe528e98a5743c662888
Reviewed-on: https://gerrit.libreoffice.org/53366
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Bunth <btomi96@gmail.com>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/core/misc/dsntypes.cxx | 10 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/generalpage.cxx | 11 |
2 files changed, 18 insertions, 3 deletions
diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx index 34f3c5ace0e1..7e48dd90fbb7 100644 --- a/dbaccess/source/core/misc/dsntypes.cxx +++ b/dbaccess/source/core/misc/dsntypes.cxx @@ -25,6 +25,7 @@ #include <stringconstants.hxx> #include <comphelper/documentconstants.hxx> #include <comphelper/string.hxx> +#include <svtools/miscopt.hxx> namespace dbaccess { @@ -295,7 +296,14 @@ OUString ODsnTypeCollection::getEmbeddedDatabase() const } } if ( sEmbeddedDatabaseURL.isEmpty() ) - sEmbeddedDatabaseURL = "sdbc:embedded:hsqldb"; + { + SvtMiscOptions aMiscOptions; + if( aMiscOptions.IsExperimentalMode() ) + sEmbeddedDatabaseURL = "sdbc:embedded:firebird"; + else + sEmbeddedDatabaseURL = "sdbc:embedded:hsqldb"; + + } return sEmbeddedDatabaseURL; } diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 12bfe24197b7..df4af30d4894 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> namespace dbaui { @@ -586,9 +587,15 @@ namespace dbaui OUString OGeneralPageWizard::getDatasourceName(const SfxItemSet& _rSet) { - // Sets jdbc as the default selected database on startup. + // Sets the default selected database on startup. if (m_pRB_CreateDatabase->IsChecked() ) - return m_pCollection->getTypeDisplayName( "jdbc:" ); + { + SvtMiscOptions aMiscOptions; + if( aMiscOptions.IsExperimentalMode() ) + return m_pCollection->getTypeDisplayName( "sdbc:embedded:firebird" ); + else + return m_pCollection->getTypeDisplayName( "jdbc:" ); + } return OGeneralPage::getDatasourceName( _rSet ); } |