diff options
| author | Tamas Bunth <tamas.bunth@collabora.co.uk> | 2018-10-08 11:04:48 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-10-25 14:52:44 +0200 |
| commit | 36defede63afe94e9bc6872eac955757c49452c1 (patch) | |
| tree | 22808dc57e280b96da66d96190e50dea826236c9 /dbaccess | |
| parent | e840ab22b71898c07a4d44dbeae250f93b7b5983 (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>
Reviewed-on: https://gerrit.libreoffice.org/62318
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.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 adf5e01bde07..a0ff5233d6cf 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -124,6 +124,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 e8a3f444806a..c8a597562362 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< 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 ); |