summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorTamas Bunth <tamas.bunth@collabora.co.uk>2018-09-22 14:31:23 +0200
committerAndras Timar <andras.timar@collabora.com>2018-09-29 00:59:34 +0200
commitf3d959aa4b3d5ce46b52617d69ef51f434a061c8 (patch)
tree72a8384f889e39d5326b0149f864c0ccf54a4e6f /dbaccess
parentcc1276e217463da9b53d4bd3cbe3be04536568cb (diff)
tdf#119850 show missing mysql connector options
For MYSQL connections there is an extra window which determines how to connect to a mysql/mariadb database. This functionality is handled in OGeneralPageWizard::approveDatasourceType. Change-Id: Ia3c548103b694731cba47ff5390c34b072a938a0 Reviewed-on: https://gerrit.libreoffice.org/60893 Reviewed-by: Tamás Bunth <btomi96@gmail.com> Tested-by: Tamás Bunth <btomi96@gmail.com> (cherry picked from commit 37dba4f25f00ffc1a1a631772eadd50e998966c1)
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx2
-rw-r--r--dbaccess/source/ui/dlg/generalpage.cxx6
2 files changed, 2 insertions, 6 deletions
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 784f0938a560..3c9a18c81db2 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -281,7 +281,7 @@ using namespace ::com::sun::star;
{
// show the "Connect directly" option only if the driver is installed
const DbuTypeCollectionItem* pCollectionItem = dynamic_cast<const DbuTypeCollectionItem*>( _rSet.GetItem(DSID_TYPECOLLECTION) );
- bool bHasMySQLNative = ( pCollectionItem != nullptr ) && pCollectionItem->getCollection()->hasDriver( "sdbc:mysqlc:" );
+ bool bHasMySQLNative = ( pCollectionItem != nullptr ) && pCollectionItem->getCollection()->hasDriver( "sdbc:mysql:mysqlc:" );
if ( bHasMySQLNative )
m_pNATIVEDatabase->Show();
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 28a79c048981..adf5e01bde07 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -616,13 +616,9 @@ namespace dbaui
switch ( eType )
{
case ::dbaccess::DST_MYSQL_JDBC:
- _inout_rDisplayName = "MySQL";
- break;
case ::dbaccess::DST_MYSQL_ODBC:
case ::dbaccess::DST_MYSQL_NATIVE:
- // don't display those, the decision whether the user connects via JDBC/ODBC/C-OOo is made on another
- // page
- _inout_rDisplayName.clear();
+ _inout_rDisplayName = "MySQL";
break;
default:
break;