summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorAndrzej J.R. Hunt <andrzej@ahunt.org>2013-09-06 21:03:10 +0100
committerAndrzej J.R. Hunt <andrzej@ahunt.org>2013-09-06 21:27:57 +0100
commit79eae295dd40a34e55c4a0a9e870183d78070655 (patch)
tree3d9f34ee301f62b295f34540d3da0994218bbc68 /connectivity
parentcf9a6e84f5ffc4fe4a8273e8fdb6550b64c78732 (diff)
Comment out unused parameters instead of (void) cast. (firebird-sdbc)
Firebird doesn't support catalogs or schemas hence these parameters are unused in the various get[...] methods. Previously these were (void) casted however commenting out the parameters seems more correct and reduces the amount of code. (This was omitted for as-of-yet unimplemented methods since they will still be looked at in detail.) Change-Id: Ic6566ff0b3e873b802deec79d5497efdd21e577d
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/drivers/firebird/DatabaseMetaData.cxx44
1 files changed, 15 insertions, 29 deletions
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index 0f86ad54fbd5..19f66d5b11da 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -1031,15 +1031,12 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
}
uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
- const Any& aCatalog,
- const OUString& sSchema,
+ const Any& /*aCatalog*/,
+ const OUString& /*sSchema*/,
const OUString& sTable,
const OUString& sColumnNamePattern)
throw(SQLException, RuntimeException)
{
- (void) aCatalog;
- (void) sSchema;
-
SAL_INFO("connectivity.firebird", "getColumnPrivileges() with "
"Table: " << sTable
<< " & ColumnNamePattern: " << sColumnNamePattern);
@@ -1109,14 +1106,12 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
}
uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
- const Any& catalog,
- const OUString& schemaPattern,
+ const Any& /*catalog*/,
+ const OUString& /*schemaPattern*/,
const OUString& tableNamePattern,
const OUString& columnNamePattern)
throw(SQLException, RuntimeException)
{
- (void) catalog; // Unsupported in firebird
- (void) schemaPattern; // Unsupported in firebird
SAL_INFO("connectivity.firebird", "getColumns() with "
"TableNamePattern: " << tableNamePattern <<
" & ColumnNamePattern: " << columnNamePattern);
@@ -1298,15 +1293,12 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
}
uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
- const Any& catalog,
- const OUString& schemaPattern,
+ const Any& /*catalog*/,
+ const OUString& /*schemaPattern*/,
const OUString& tableNamePattern,
const Sequence< OUString >& types)
throw(SQLException, RuntimeException)
{
- (void) catalog;
- (void) schemaPattern;
-
SAL_INFO("connectivity.firebird", "getTables() with "
"TableNamePattern: " << tableNamePattern);
@@ -1488,13 +1480,11 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
}
uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
- const Any& aCatalog,
- const OUString& sSchema,
+ const Any& /*aCatalog*/,
+ const OUString& /*sSchema*/,
const OUString& sTable)
throw(SQLException, RuntimeException)
{
- (void) aCatalog;
- (void) sSchema;
SAL_INFO("connectivity.firebird", "getPrimaryKeys() with "
"Table: " << sTable);
@@ -1551,17 +1541,16 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
}
uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
- const Any& aCatalog, const OUString& sSchema, const OUString& sTable,
- sal_Bool bIsUnique, sal_Bool bIsApproximate)
+ const Any& /*aCatalog*/,
+ const OUString& /*sSchema*/,
+ const OUString& sTable,
+ sal_Bool bIsUnique,
+ sal_Bool bIsApproximate)
throw(SQLException, RuntimeException)
{
- (void) aCatalog;
- (void) sSchema;
-
// Apparently this method can also return a "tableIndexStatistic"
// However this is only mentioned in XDatabaseMetaData.idl (whose comments
// are duplicated in the postgresql driver), and is otherwise undocumented.
-
SAL_INFO("connectivity.firebird", "getPrimaryKeys() with "
"Table: " << sTable);
@@ -1658,14 +1647,11 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
}
uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
- const Any& aCatalog,
- const OUString& sSchemaPattern,
+ const Any& /*aCatalog*/,
+ const OUString& /*sSchemaPattern*/,
const OUString& sTableNamePattern)
throw(SQLException, RuntimeException)
{
- (void) aCatalog;
- (void) sSchemaPattern;
-
SAL_INFO("connectivity.firebird", "getTablePrivileges() with "
"TableNamePattern: " << sTableNamePattern);