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>
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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 );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user