[Libreoffice-commits] core.git: connectivity/registry dbaccess/source

[Libreoffice Gerrit user]

 connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu |    2 +-
 dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx                         |    2 +-
 dbaccess/source/ui/dlg/generalpage.cxx                                    |    6 +-----
 3 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 37dba4f25f00ffc1a1a631772eadd50e998966c1
Author:     Tamas Bunth <tamas.bunth at collabora.co.uk>
AuthorDate: Sat Sep 22 14:31:23 2018 +0200
Commit:     Tamás Bunth <btomi96 at gmail.com>
CommitDate: Sat Sep 22 18:44:13 2018 +0200

    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 at gmail.com>
    Tested-by: Tamás Bunth <btomi96 at gmail.com>

diff --git a/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu
index eec6fe8f99ec..2be9b6658c92 100644
--- a/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -18,7 +18,7 @@
  -->
 <oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <node oor:name="Installed" install:module="mysqlc">
-    <node oor:name="sdbc:mysqlc:*" oor:op="replace">
+    <node oor:name="sdbc:mysql:mysqlc:*" oor:op="replace">
       <prop oor:name="Driver">
         <value>com.sun.star.comp.sdbc.mysqlc.MysqlCDriver</value>
       </prop>
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index e1ffd84be35c..69b46357d2c1 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -278,7 +278,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 e3efcaaedaf3..9826ffb3f985 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -608,13 +608,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;