diff options
-rw-r--r-- | dbaccess/source/core/misc/dsntypes.cxx | 8 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/generalpage.cxx | 7 |
2 files changed, 2 insertions, 13 deletions
diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx index 644aa6e526cd..aeca5a029655 100644 --- a/dbaccess/source/core/misc/dsntypes.cxx +++ b/dbaccess/source/core/misc/dsntypes.cxx @@ -25,7 +25,6 @@ #include <stringconstants.hxx> #include <comphelper/documentconstants.hxx> #include <comphelper/string.hxx> -#include <svtools/miscopt.hxx> namespace dbaccess { @@ -300,12 +299,7 @@ OUString ODsnTypeCollection::getEmbeddedDatabase() const } if ( sEmbeddedDatabaseURL.isEmpty() ) { - SvtMiscOptions aMiscOptions; - if( aMiscOptions.IsExperimentalMode() ) - sEmbeddedDatabaseURL = "sdbc:embedded:firebird"; - else - sEmbeddedDatabaseURL = "sdbc:embedded:hsqldb"; - + sEmbeddedDatabaseURL = "sdbc:embedded:firebird"; } return sEmbeddedDatabaseURL; diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index e324ed3859e4..9f1c2c6f58a6 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -41,7 +41,6 @@ #include <comphelper/processfactory.hxx> #include <unotools/confignode.hxx> #include <osl/diagnose.h> -#include <svtools/miscopt.hxx> #include <sal/log.hxx> namespace dbaui @@ -597,11 +596,7 @@ namespace dbaui // Sets the default selected database on startup. if (m_pRB_CreateDatabase->IsChecked() ) { - SvtMiscOptions aMiscOptions; - if( aMiscOptions.IsExperimentalMode() ) - return m_pCollection->getTypeDisplayName( "sdbc:embedded:firebird" ); - else - return m_pCollection->getTypeDisplayName( "jdbc:" ); + return m_pCollection->getTypeDisplayName( "sdbc:firebird:" ); } return OGeneralPage::getDatasourceName( _rSet ); |