https://bugs.documentfoundation.org/show_bug.cgi?id=128950
--- Comment #16 from Julien Nabet <[email protected]> --- (In reply to Robert Großkopf from comment #15) > .. > MariaDB(MySQL) and PostgreSQL are the only databases, which are used with > the internal native driver and through JDBC and ODBC. So it is a good idea > to limit the entries by setting a subfolder for these three entries for > every database. Thank you for your feedback Robert. With this patch, LO displays one generic "MYSQL" entry in both cases. diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index e3bacdefbc73..6d4f99e07436 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -304,6 +304,18 @@ namespace dbaui bool OGeneralPage::approveDatasourceType( ::dbaccess::DATASOURCE_TYPE eType, OUString& _inout_rDisplayName ) { + + switch ( eType ) + { + case ::dbaccess::DST_MYSQL_JDBC: + case ::dbaccess::DST_MYSQL_ODBC: + case ::dbaccess::DST_MYSQL_NATIVE: + _inout_rDisplayName = "MySQL"; + break; + default: + break; + } + if ( eType == ::dbaccess::DST_MYSQL_NATIVE_DIRECT ) { // do not display the Connector/OOo driver itself, it is always wrapped via the MySQL-Driver, if @@ -559,17 +571,6 @@ namespace dbaui bool OGeneralPageWizard::approveDatasourceType( ::dbaccess::DATASOURCE_TYPE eType, OUString& _inout_rDisplayName ) { - switch ( eType ) - { - case ::dbaccess::DST_MYSQL_JDBC: - case ::dbaccess::DST_MYSQL_ODBC: - case ::dbaccess::DST_MYSQL_NATIVE: - _inout_rDisplayName = "MySQL"; - break; - default: - break; - } - return OGeneralPage::approveDatasourceType( eType, _inout_rDisplayName ); } The pb is how to call OMySQLIntroPageSetup for the changing connection case and I must recognize I don't understand the mechanism of RoadmapWizardMachine/wizardmachine/dbwiz/dbwizsetup Lionel: if you got some idea, don't hesitate. As for me, I'm stuck. -- You are receiving this mail because: You are the assignee for the bug.
