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

[Libreoffice Gerrit user]

 dbaccess/source/core/misc/dsntypes.cxx |    8 +-------
 dbaccess/source/ui/dlg/generalpage.cxx |    7 +------
 2 files changed, 2 insertions(+), 13 deletions(-)

New commits:
commit 7ed1e978965c6da94c409631e36b7447835d44bf
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Feb 6 12:59:07 2019 +0100
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Thu Feb 7 23:39:04 2019 +0100

    Make Firebird the (unconditional) default for new databases
    
    60db3d2cc3bc4f124bd4d819fbd0285e7f19c8c4 "dbu: Set Firebird to default in
    wizard.." had done so only "..in case experimental feature is checked in", but
    Firebird has been made non-experimental meanwhile as documented at <https://
    wiki.documentfoundation.org/index.php?title=ReleaseNotes/6.2&oldid=169290#Base>.
    
    <https://bugs.documentfoundation.org/show_bug.cgi?id=123099> "Creating new
    'HSQLDB Embedded' database immediately brings up migration-to-Firebird dialog"
    discusses that changing the default to Firebird may be beneficial, so lets do
    that unconditionally now.
    
    But 60db3d2cc3bc4f124bd4d819fbd0285e7f19c8c4 had apparently made a mistake,
    setting the value returned from OGeneralPageWizard::getDatasourceName to
    "sdbc:embedded:firebird" even though the corresponding "Connect to an exisiting
    database" list in the new database wizard doesn't even support that (instead of
    "sdbc:firebird:", which matches "Firebird File" in that list).  Fixed that now.
    
    (Curiously, ODsnTypeCollection::getEmbeddedDatabase would read a
    DefaultEmbeddedDatabase value from the configuration before resorting to the
    hardcoded default, but `git log -SDefaultEmbeddedDatabase` makes it look like
    there has never been any code to actually write that setting.)
    
    Change-Id: I49b7430f5f8288a6a166ed9184cb438208d56ca1
    Reviewed-on: https://gerrit.libreoffice.org/67449
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit 98c0b20864af965c3bb99a32f8ea57be7402e534)
    Reviewed-on: https://gerrit.libreoffice.org/67460
    Reviewed-by: Tamás Bunth <btomi96 at gmail.com>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

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 );