diff options
| author | Tamas Bunth <tamas.bunth@collabora.co.uk> | 2018-10-08 11:04:48 +0200 |
|---|---|---|
| committer | Tamás Bunth <btomi96@gmail.com> | 2018-10-14 22:16:05 +0200 |
| commit | b2cefc2e36925b4384eb0aea54aa2c6bcfb018a8 (patch) | |
| tree | f1ab6e9fec3c66f0a3285b3ffffcbae38dc7185d /dbaccess | |
| parent | ba6723431afa843232fadf44e12ddab44e85c9f0 (diff) | |
Revert removal of mysql jdbc connector
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 <btomi96@gmail.com>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/dlg/generalpage.cxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/generalpage.hxx | 5 |
2 files changed, 9 insertions, 0 deletions
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<ISaveValueWrapper> >& _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 ); |