From b2cefc2e36925b4384eb0aea54aa2c6bcfb018a8 Mon Sep 17 00:00:00 2001 From: Tamas Bunth Date: Mon, 8 Oct 2018 11:04:48 +0200 Subject: Revert removal of mysql jdbc connector MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And also make some minor fixes so it cooperates with the new mysqlc library. Change-Id: I866add99a699150c6550ee7f7ff2ee947e07117c Reviewed-on: https://gerrit.libreoffice.org/61648 Tested-by: Jenkins Reviewed-by: Tamás Bunth --- dbaccess/source/ui/dlg/generalpage.cxx | 4 ++++ dbaccess/source/ui/dlg/generalpage.hxx | 5 +++++ 2 files changed, 9 insertions(+) (limited to 'dbaccess') diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 9826ffb3f985..0963e3a7bb5a 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -126,6 +126,10 @@ namespace dbaui const OUString sURLPrefix = aTypeLoop.getURLPrefix(); if ( !sURLPrefix.isEmpty() ) { + // skip mysql connection variations. It is handled in another window. + if(sURLPrefix.startsWith("sdbc:mysql:") && !sURLPrefix.startsWith("sdbc:mysql:jdbc:")) + continue; + OUString sDisplayName = aTypeLoop.getDisplayName(); if ( m_pDatasourceType->GetEntryPos( sDisplayName ) == LISTBOX_ENTRY_NOTFOUND && approveDatasourceType( sURLPrefix, sDisplayName ) ) diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index b5b22ec38b89..7a9879becd14 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -85,6 +85,11 @@ namespace dbaui virtual void fillWindows(std::vector< std::unique_ptr >& _rControlList) override; void onTypeSelected(const OUString& _sURLPrefix); + + /** + * Initializes the listbox, which contains entires each representing a + * connection to an existing database. + */ void initializeTypeList(); void implSetCurrentType( const OUString& _eType ); -- cgit