[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - connectivity/source

[Mike Kaganski (via logerrit)]

 connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 2e6c2abc59f0190c20f5096c803edfa763624e30
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Mon Sep 16 13:46:17 2019 +0200
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Mon Sep 16 13:49:03 2019 +0200

    Fix Windows build after 19f8ea668833a4dc90244792cbf91881b0ca9a07
    
    
c:\lo\src\core\connectivity\source\drivers\mysqlc\mysqlc_databasemetadata.cxx(1058)
 : error C2220: warning treated as error - no 'object' file generated
    
c:\lo\src\core\connectivity\source\drivers\mysqlc\mysqlc_databasemetadata.cxx(1058)
 : warning C4702: unreachable code
    
    Make code match commit acafd1ac87cb23a447353b8f0419a25fbe1c4430 in master
    
    Change-Id: I1da66e8cf97eb5820023c5bfa6342eb31cf89b74
    Reviewed-on: https://gerrit.libreoffice.org/78984
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    Tested-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
index 736fa20d1f40..28319d00bd88 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
@@ -1049,13 +1049,9 @@ Reference<XResultSet> SAL_CALL 
ODatabaseMetaData::getBestRowIdentifier(const Any
 Reference<XResultSet> SAL_CALL ODatabaseMetaData::getTablePrivileges(
     const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& 
/*tableNamePattern*/)
 {
-    Reference<XResultSet> 
xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(
-                                         
"org.openoffice.comp.helper.DatabaseMetaDataResultSet"),
-                                     UNO_QUERY);
     // TODO
     SAL_WARN("connectivity.mysqlc", "method not implemented");
     throw SQLException("getTablePrivileges method not implemented", *this, 
"IM001", 0, Any());
-    return xResultSet;
 }
 
 Reference<XResultSet> SAL_CALL ODatabaseMetaData::getCrossReference(
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits