summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/dlg/dbwiz.cxx
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-02-16 07:31:09 +0000
committerOliver Bolte <obo@openoffice.org>2009-02-16 07:31:09 +0000
commitb5345a6f8629478c9e543c494063bfec51ddbf74 (patch)
treec95338ebbc74ec5f2472a815b3d2f876134d81bb /dbaccess/source/ui/dlg/dbwiz.cxx
parentcaa3bf5c34c08e5e93a03deb3064792139f030bb (diff)
CWS-TOOLING: integrate CWS mysql1
2009-01-29 13:25:23 +0100 fs r267126 : #i98559# 2009-01-29 10:29:23 +0100 fs r267100 : #i98559# 2009-01-29 09:56:20 +0100 fs r267098 : do not display empty schematas in the table list in the query designer 2009-01-29 09:40:28 +0100 fs r267097 : corrected acceptsURL 2009-01-28 11:17:42 +0100 fs r267042 : display empty catalogs/schemas, if indicated by the connection settings 2009-01-28 11:14:30 +0100 fs r267040 : +displayEmptyTableFolders 2009-01-28 11:03:28 +0100 fs r267036 : mysql:mysqlc, not mysql:mysql, for the native driver 2009-01-28 10:23:53 +0100 fs r267031 : select the first catalog/schema, if the guess for the current one did not match 2009-01-28 10:22:23 +0100 fs r267030 : select the first catalog/schema, if the guess for the current one did not match 2009-01-27 15:03:29 +0100 fs r266996 : #i10000# 2009-01-27 14:56:13 +0100 fs r266992 : #i20563# better (more dedicated) UI for the MySQL native driver's properties 2009-01-27 08:20:24 +0100 oj r266953 : enable sdbcx mysql driver for mysqlc 2009-01-27 08:20:09 +0100 oj r266952 : enable sdbcx mysql driver for mysqlc
Diffstat (limited to 'dbaccess/source/ui/dlg/dbwiz.cxx')
-rw-r--r--dbaccess/source/ui/dlg/dbwiz.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index ae2e827616ac..3ace14f2fc36 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -202,6 +202,9 @@ WizardTypes::WizardState ODbTypeWizDialog::determineNextState( WizardState _nCur
case ::dbaccess::DST_MACAB:
nNextState = WZS_INVALID_STATE;
break;
+ case ::dbaccess::DST_MYSQL_NATIVE:
+ nNextState = ADDITIONAL_PAGE_MYSQL_NATIVE;
+ break;
default:
nNextState = CONNECTION_PAGE;
break;
@@ -235,9 +238,6 @@ WizardTypes::WizardState ODbTypeWizDialog::determineNextState( WizardState _nCur
case ::dbaccess::DST_ADABAS:
nNextState = ADDITIONAL_PAGE_ADABAS;
break;
- case ::dbaccess::DST_MYSQL_NATIVE:
- nNextState = ADDITIONAL_PAGE_MYSQL_NATIVE;
- break;
case ::dbaccess::DST_MYSQL_JDBC:
nNextState = ADDITIONAL_PAGE_MYSQL_JDBC;
break;
@@ -335,7 +335,7 @@ TabPage* ODbTypeWizDialog::createPage(WizardState _nState)
case ADDITIONAL_PAGE_MYSQL_JDBC:
pPage = ODriversSettings::CreateMySQLJDBC(this,*m_pOutSet);
break;
- case ADDITIONAL_PAGE_MYSQL_NATIVE:
+ case ADDITIONAL_PAGE_MYSQL_NATIVE:
pPage = ODriversSettings::CreateMySQLNATIVE(this,*m_pOutSet);
break;
case ADDITIONAL_PAGE_MYSQL_ODBC: