connectivity/source/drivers/firebird/DatabaseMetaData.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c9f744f9af66f72fc1fb8aefafe5fadd50914f5c
Author: Muhammet Kara <muhammet.k...@pardus.org.tr>
AuthorDate: Sat Jul 21 07:06:10 2018 +0300
Commit: Muhammet Kara <muhammet.k...@pardus.org.tr>
CommitDate: Sat Jul 28 17:44:48 2018 +0200
Restore the accidentally overwritten array value in ODatabaseMetaData
Seems like there was a copy/paste/programming error
in baaa43446f5661177b4900f260bba313883c4032
Change-Id: I9cb9ee816f274457d6632064bdbff926565f906d
Reviewed-on: https://gerrit.libreoffice.org/57793
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.k...@pardus.org.tr>
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index 6408fea4d8b4..9ef2a59f6e61 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -1070,7 +1070,7 @@ uno::Reference< XResultSet > SAL_CALL
ODatabaseMetaData::getColumnPrivileges(
uno::Reference< XRow > xRow( rs, UNO_QUERY_THROW );
ODatabaseMetaDataResultSet::ORows aResults;
- ODatabaseMetaDataResultSet::ORow aCurrentRow(8);
+ ODatabaseMetaDataResultSet::ORow aCurrentRow(9);
aCurrentRow[0] = new ORowSetValueDecorator(); // Unused
aCurrentRow[1] = new ORowSetValueDecorator(); // 1. TABLE_CAT Unsupported
aCurrentRow[2] = new ORowSetValueDecorator(); // 1. TABLE_SCHEM Unsupported
@@ -1084,7 +1084,7 @@ uno::Reference< XResultSet > SAL_CALL
ODatabaseMetaData::getColumnPrivileges(
aCurrentRow[5] = new
ORowSetValueDecorator(sanitizeIdentifier(xRow->getString(2))); // 5. GRANTOR
aCurrentRow[6] = new
ORowSetValueDecorator(sanitizeIdentifier(xRow->getString(3))); // 6. GRANTEE
aCurrentRow[7] = new ORowSetValueDecorator(xRow->getString(4)); // 7.
Privilege
- aCurrentRow[7] = new ORowSetValueDecorator( ( xRow->getShort(5) == 1 )
?
+ aCurrentRow[8] = new ORowSetValueDecorator( ( xRow->getShort(5) == 1 )
?
OUString("YES") : OUString("NO")); // 8. Grantable
aResults.push_back(aCurrentRow);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
