From 41dbfa9ec7380e082279f1b01bfd323d23134b7d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sun, 2 Jul 2017 22:34:08 +0200 Subject: loplugin:casttovoid: connectivity Change-Id: I03127890499dac67816bb43a8c3fb9dd87eefcab --- connectivity/source/commontools/paramwrapper.cxx | 1 - connectivity/source/drivers/dbase/DTable.cxx | 12 +-- .../source/drivers/firebird/Connection.cxx | 3 +- .../source/drivers/firebird/DatabaseMetaData.cxx | 100 ++++++--------------- connectivity/source/drivers/firebird/Driver.cxx | 3 +- .../source/drivers/firebird/PreparedStatement.cxx | 31 ++----- connectivity/source/drivers/firebird/ResultSet.cxx | 20 ++--- .../source/drivers/firebird/ResultSetMetaData.cxx | 30 +++---- connectivity/source/drivers/firebird/Statement.cxx | 3 +- .../drivers/firebird/StatementCommonBase.cxx | 18 ++-- connectivity/source/drivers/firebird/Table.cxx | 3 +- connectivity/source/drivers/firebird/User.cxx | 12 +-- connectivity/source/drivers/firebird/User.hxx | 7 +- connectivity/source/drivers/firebird/Users.cxx | 11 +-- connectivity/source/drivers/hsqldb/HDriver.cxx | 3 +- connectivity/source/drivers/jdbc/JStatement.cxx | 3 +- connectivity/source/drivers/mork/MConnection.cxx | 3 +- connectivity/source/drivers/mork/MConnection.hxx | 2 +- connectivity/source/drivers/mork/MDriver.cxx | 11 +-- .../drivers/mozab/bootstrap/MMozillaBootstrap.cxx | 11 +-- .../drivers/mozab/bootstrap/MNSProfileDiscover.cxx | 4 +- connectivity/source/drivers/odbc/OConnection.cxx | 1 - .../drivers/postgresql/pq_databasemetadata.cxx | 37 +++----- .../source/drivers/postgresql/pq_driver.cxx | 6 +- .../drivers/postgresql/pq_preparedstatement.cxx | 38 ++++---- .../drivers/postgresql/pq_resultsetmetadata.cxx | 18 ++-- .../source/drivers/postgresql/pq_xindexcolumns.cxx | 6 +- .../source/drivers/postgresql/pq_xindexes.cxx | 5 +- .../source/drivers/postgresql/pq_xkeycolumns.cxx | 6 +- .../source/drivers/postgresql/pq_xuser.cxx | 12 +-- connectivity/source/parse/sqliterator.cxx | 1 - 31 files changed, 134 insertions(+), 287 deletions(-) (limited to 'connectivity') diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx index 5e115fd5b3e0..8185b34ce2eb 100644 --- a/connectivity/source/commontools/paramwrapper.cxx +++ b/connectivity/source/commontools/paramwrapper.cxx @@ -181,7 +181,6 @@ namespace param sal_Bool ParameterWrapper::convertFastPropertyValue(Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue) { OSL_ENSURE( PROPERTY_ID_VALUE == nHandle, "ParameterWrapper::convertFastPropertyValue: the only non-readonly prop should be our PROPERTY_VALUE!" ); - (void)nHandle; // we're lazy here ... rOldValue = m_aValue.makeAny(); diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 3e14a594bbb7..66f676bf19eb 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -1160,10 +1160,8 @@ bool ODbaseTable::CreateFile(const INetURLObject& aFile, bool& bCreateMemo) } // switch (getINT32(xCol->getPropertyValue(sPropType))) } } - catch ( const Exception& e ) + catch ( const Exception& ) { - (void)e; - try { // we have to drop the file because it is corrupted now @@ -1356,10 +1354,8 @@ bool ODbaseTable::CreateFile(const INetURLObject& aFile, bool& bCreateMemo) (*m_pFileStream).WriteUChar( dBaseIIIMemo ); } // if (bCreateMemo) } - catch ( const Exception& e ) + catch ( const Exception& ) { - (void)e; - try { // we have to drop the file because it is corrupted now @@ -2515,11 +2511,11 @@ void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos) } } bOk = _pNewTable->InsertRow(*aInsertRow,_pNewTable->m_pColumns); - SAL_WARN_IF(!bOk, "connectivity.drivers", "Row could not be inserted!"); (void)bOk; + SAL_WARN_IF(!bOk, "connectivity.drivers", "Row could not be inserted!"); } else { - SAL_WARN_IF(!bOk, "connectivity.drivers", "Row could not be fetched!"); (void)bOk; + SAL_WARN_IF(!bOk, "connectivity.drivers", "Row could not be fetched!"); } } else diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx index a17222f52f31..0511391ebc32 100644 --- a/connectivity/source/drivers/firebird/Connection.cxx +++ b/connectivity/source/drivers/firebird/Connection.cxx @@ -792,10 +792,9 @@ Reference< XNameAccess > SAL_CALL Connection::getTypeMap() return nullptr; } -void SAL_CALL Connection::setTypeMap(const Reference< XNameAccess >& typeMap) +void SAL_CALL Connection::setTypeMap(const Reference< XNameAccess >&) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setTypeMap", *this ); - (void) typeMap; } //----- XCloseable ----------------------------------------------------------- diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx index 6bfa79c9794d..db6609f722ee 100644 --- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx @@ -315,11 +315,9 @@ sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable() return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert(sal_Int32 fromType, - sal_Int32 toType) +sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert(sal_Int32, + sal_Int32) { - (void) fromType; - (void) toType; return false; } @@ -718,57 +716,48 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( return false; } -sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) +sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 ) { - (void) setType; return false; } -sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) +sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 ) { - (void) setType; return false; } -sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) +sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 ) { - (void) setType; return false; } -sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) +sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 ) { - (void) setType; return false; } -sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) +sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 ) { - (void) setType; return false; } -sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) +sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 ) { - (void) setType; return false; } -sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 setType ) +sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 ) { - (void) setType; return false; } -sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 setType ) +sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 ) { - (void) setType; return false; } -sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 setType ) +sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 ) { - (void) setType; return false; } @@ -1412,65 +1401,49 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( } uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns( - const Any& catalog, const OUString& schemaPattern, - const OUString& procedureNamePattern, const OUString& columnNamePattern ) + const Any&, const OUString&, + const OUString&, const OUString& ) { SAL_WARN("connectivity.firebird", "Not yet implemented"); - (void) catalog; - (void) schemaPattern; - (void) procedureNamePattern; - (void) columnNamePattern; OSL_FAIL("Not implemented yet!"); // TODO implement return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eProcedureColumns); } uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( - const Any& catalog, const OUString& schemaPattern, - const OUString& procedureNamePattern ) + const Any&, const OUString&, + const OUString& ) { SAL_WARN("connectivity.firebird", "Not yet implemented"); - (void) catalog; - (void) schemaPattern; - (void) procedureNamePattern; OSL_FAIL("Not implemented yet!"); // TODO implement return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eProcedures); } uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns( - const Any& catalog, const OUString& schema, const OUString& table ) + const Any&, const OUString&, const OUString& ) { SAL_WARN("connectivity.firebird", "Not yet implemented"); - (void) catalog; - (void) schema; - (void) table; OSL_FAIL("Not implemented yet!"); // TODO implement return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eVersionColumns); } uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( - const Any& catalog, const OUString& schema, const OUString& table ) + const Any&, const OUString&, const OUString& ) { // List the columns in a table which are foreign keys. This is actually // never used anywhere in the LO codebase currently. Retrieval from firebird // requires using a 5-table join. SAL_WARN("connectivity.firebird", "Not yet implemented"); - (void) catalog; - (void) schema; - (void) table; OSL_FAIL("Not implemented yet!"); // TODO implement return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eExportedKeys); } uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( - const Any& catalog, const OUString& schema, const OUString& table ) + const Any&, const OUString&, const OUString& table ) { - (void) catalog; - (void) schema; - ODatabaseMetaDataResultSet* pResultSet = new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eImportedKeys); uno::Reference< XResultSet > xResultSet = pResultSet; @@ -1619,7 +1592,8 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( const OUString& /*sSchema*/, const OUString& sTable, sal_Bool bIsUnique, - sal_Bool bIsApproximate) + sal_Bool) // TODO: what is bIsApproximate? + { // Apparently this method can also return a "tableIndexStatistic" // However this is only mentioned in XDatabaseMetaData.idl (whose comments @@ -1648,9 +1622,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( if (bIsUnique) aQueryBuf.append("AND (indices.RDB$UNIQUE_FLAG = 1) "); - // TODO: what is bIsApproximate? - (void) bIsApproximate; - OUString sQuery = aQueryBuf.makeStringAndClear(); uno::Reference< XStatement > xStatement = m_pConnection->createStatement(); @@ -1708,14 +1679,9 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( } uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier( - const Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, - sal_Bool nullable ) -{ - (void) catalog; - (void) schema; - (void) table; - (void) scope; - (void) nullable; + const Any&, const OUString&, const OUString&, sal_Int32, + sal_Bool ) +{ OSL_FAIL("Not implemented yet!"); // TODO implement return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eBestRowIdentifier); @@ -1789,27 +1755,17 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( } uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( - const Any& primaryCatalog, const OUString& primarySchema, - const OUString& primaryTable, const Any& foreignCatalog, - const OUString& foreignSchema, const OUString& foreignTable ) -{ - (void) primaryCatalog; - (void) primarySchema; - (void) primaryTable; - (void) foreignCatalog; - (void) foreignSchema; - (void) foreignTable; + const Any&, const OUString&, + const OUString&, const Any&, + const OUString&, const OUString& ) +{ OSL_FAIL("Not implemented yet!"); // TODO implement return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eCrossReference); } -uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const Sequence< sal_Int32 >& types ) +uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any&, const OUString&, const OUString&, const Sequence< sal_Int32 >& ) { - (void) catalog; - (void) schemaPattern; - (void) typeNamePattern; - (void) types; OSL_FAIL("Not implemented yet!"); // TODO implement return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eUDTs); diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx index e3bdc3540cf0..399afad3ddb5 100644 --- a/connectivity/source/drivers/firebird/Driver.cxx +++ b/connectivity/source/drivers/firebird/Driver.cxx @@ -205,9 +205,8 @@ sal_Bool SAL_CALL FirebirdDriver::acceptsURL( const OUString& url ) } Sequence< DriverPropertyInfo > SAL_CALL FirebirdDriver::getPropertyInfo( - const OUString& url, const Sequence< PropertyValue >& info ) + const OUString& url, const Sequence< PropertyValue >& ) { - (void) info; if ( ! acceptsURL(url) ) { ::connectivity::SharedResources aResources; diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx index 89e1650e5213..400b6c147cf8 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.cxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx @@ -482,10 +482,8 @@ void OPreparedStatement::closeBlobAfterWriting(isc_blob_handle& rBlobHandle) } } -void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x ) +void SAL_CALL OPreparedStatement::setClob( sal_Int32, const Reference< XClob >& ) { - (void) parameterIndex; - (void) x; ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -542,20 +540,16 @@ void SAL_CALL OPreparedStatement::setBlob(sal_Int32 nParameterIndex, } -void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Reference< XArray >& x ) +void SAL_CALL OPreparedStatement::setArray( sal_Int32, const Reference< XArray >& ) { - (void) parameterIndex; - (void) x; ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); } -void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Reference< XRef >& x ) +void SAL_CALL OPreparedStatement::setRef( sal_Int32, const Reference< XRef >& ) { - (void) parameterIndex; - (void) x; ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -646,21 +640,16 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c } -void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) +void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32, sal_Int32, const ::rtl::OUString& ) { - (void) parameterIndex; - (void) sqlType; - (void) typeName; ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); } -void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) +void SAL_CALL OPreparedStatement::setObject( sal_Int32, const Any& ) { - (void) parameterIndex; - (void) x; ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -714,22 +703,16 @@ void SAL_CALL OPreparedStatement::setBytes(sal_Int32 nParameterIndex, } -void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) +void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32 ) { - (void) parameterIndex; - (void) x; - (void) length; ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); } -void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) +void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32 ) { - (void) parameterIndex; - (void) x; - (void) length; ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx index fb3e72675fab..6d28111c36e4 100644 --- a/connectivity/source/drivers/firebird/ResultSet.cxx +++ b/connectivity/source/drivers/firebird/ResultSet.cxx @@ -339,18 +339,16 @@ sal_Int32 SAL_CALL OResultSet::findColumn(const OUString& rColumnName) return 0; // Never reached } -uno::Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 columnIndex ) +uno::Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 ) { - (void) columnIndex; MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); return nullptr; } -uno::Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 columnIndex ) +uno::Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 ) { - (void) columnIndex; MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -659,9 +657,8 @@ sal_Int8 SAL_CALL OResultSet::getByte(sal_Int32 nColumnIndex) return safelyRetrieveValue< ORowSetValue >(nColumnIndex); } -Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes(sal_Int32 columnIndex) +Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes(sal_Int32) { - (void) columnIndex; return Sequence< sal_Int8 >(); // TODO: implement //return safelyRetrieveValue(columnIndex); } @@ -724,9 +721,8 @@ uno::Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) return m_xMetaData; } -uno::Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 columnIndex ) +uno::Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 ) { - (void) columnIndex; MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -736,7 +732,6 @@ uno::Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 columnIndex ) uno::Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 columnIndex ) { - (void) columnIndex; MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -765,9 +760,8 @@ uno::Reference< XBlob > SAL_CALL OResultSet::getBlob(sal_Int32 columnIndex) } -uno::Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 columnIndex ) +uno::Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 ) { - (void) columnIndex; MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -775,10 +769,8 @@ uno::Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 columnIndex ) } -Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const uno::Reference< css::container::XNameAccess >& typeMap ) +Any SAL_CALL OResultSet::getObject( sal_Int32, const uno::Reference< css::container::XNameAccess >& ) { - (void) columnIndex; - (void) typeMap; MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx index 498bbaee3087..e5ba68a3bd72 100644 --- a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx +++ b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx @@ -67,20 +67,18 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType(sal_Int32 column) return getColumnTypeFromFBType(aType, aSubType, aScale); } -sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column) +sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32) { // Firebird is generally case sensitive when using quoted identifiers. // IF THIS CHANGES make ResultSet::findColumn to be case-insensitive as needed. // Generally names that are entirely UPPERCASE are case insensitive, however // there remains some ambiguity if there is another mixed-case-named column // of the same name. For safety always assume case insensitive. - (void) column; return true; } -OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32 column) +OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32) { - (void) column; return OUString(); // Schemas supported by firebird } @@ -102,9 +100,8 @@ OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column) RTL_TEXTENCODING_UTF8); } -OUString SAL_CALL OResultSetMetaData::getCatalogName(sal_Int32 column) +OUString SAL_CALL OResultSetMetaData::getCatalogName(sal_Int32) { - (void) column; return OUString(); // Catalogs not supported by firebird } @@ -130,16 +127,14 @@ OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column) return sRet; } -OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column) +OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32) { // TODO: implement - (void) column; return OUString(); } -sal_Bool SAL_CALL OResultSetMetaData::isCurrency(sal_Int32 column) +sal_Bool SAL_CALL OResultSetMetaData::isCurrency(sal_Int32) { - (void) column; return false; } @@ -179,10 +174,9 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement(sal_Int32 column) } -sal_Bool SAL_CALL OResultSetMetaData::isSigned(sal_Int32 column) +sal_Bool SAL_CALL OResultSetMetaData::isSigned(sal_Int32) { // Unsigned values aren't supported in firebird. - (void) column; return true; } @@ -234,28 +228,24 @@ sal_Int32 SAL_CALL OResultSetMetaData::isNullable(sal_Int32 column) return ColumnValue::NO_NULLS; } -sal_Bool SAL_CALL OResultSetMetaData::isSearchable(sal_Int32 column) +sal_Bool SAL_CALL OResultSetMetaData::isSearchable(sal_Int32) { // TODO: Can the column be used as part of a where clause? Assume yes - (void) column; return true; } -sal_Bool SAL_CALL OResultSetMetaData::isReadOnly(sal_Int32 column) +sal_Bool SAL_CALL OResultSetMetaData::isReadOnly(sal_Int32) { - (void) column; return m_pConnection->isReadOnly(); // Readonly only available on db level } -sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable(sal_Int32 column) +sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable(sal_Int32) { - (void) column; return !m_pConnection->isReadOnly(); } -sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) +sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 ) { - (void) column; return !m_pConnection->isReadOnly(); } diff --git a/connectivity/source/drivers/firebird/Statement.cxx b/connectivity/source/drivers/firebird/Statement.cxx index 671f50107542..62bff6d0aa28 100644 --- a/connectivity/source/drivers/firebird/Statement.cxx +++ b/connectivity/source/drivers/firebird/Statement.cxx @@ -50,9 +50,8 @@ using namespace ::osl; using namespace ::std; // ---- XBatchExecution - UNSUPPORTED ---------------------------------------- -void SAL_CALL OStatement::addBatch(const OUString& sql) +void SAL_CALL OStatement::addBatch(const OUString&) { - (void) sql; } void SAL_CALL OStatement::clearBatch() diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx index cc0e417f19db..58b5a635ea7b 100644 --- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx +++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx @@ -293,22 +293,17 @@ void SAL_CALL OStatementCommonBase::clearWarnings() } sal_Bool OStatementCommonBase::convertFastPropertyValue( - Any & rConvertedValue, - Any & rOldValue, - sal_Int32 nHandle, - const Any& rValue ) + Any &, + Any &, + sal_Int32, + const Any& ) { - (void) rConvertedValue; - (void) rOldValue; - (void) nHandle; - (void) rValue; // here we have to try to convert return false; } -void OStatementCommonBase::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) +void OStatementCommonBase::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any&) { - (void) rValue; // set the value to what ever is necessary switch(nHandle) { @@ -327,9 +322,8 @@ void OStatementCommonBase::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,co } } -void OStatementCommonBase::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const +void OStatementCommonBase::getFastPropertyValue(Any&,sal_Int32 nHandle) const { - (void) rValue; switch(nHandle) { case PROPERTY_ID_QUERYTIMEOUT: diff --git a/connectivity/source/drivers/firebird/Table.cxx b/connectivity/source/drivers/firebird/Table.cxx index bf441792555d..e16d3089a0a0 100644 --- a/connectivity/source/drivers/firebird/Table.cxx +++ b/connectivity/source/drivers/firebird/Table.cxx @@ -222,9 +222,8 @@ void SAL_CALL Table::alterColumnByName(const OUString& rColName, } // ----- XRename -------------------------------------------------------------- -void SAL_CALL Table::rename(const OUString& rName) +void SAL_CALL Table::rename(const OUString&) { - (void) rName; throw RuntimeException(); // Firebird doesn't support this. } diff --git a/connectivity/source/drivers/firebird/User.cxx b/connectivity/source/drivers/firebird/User.cxx index 1e3399f5716d..024d7eb4958a 100644 --- a/connectivity/source/drivers/firebird/User.cxx +++ b/connectivity/source/drivers/firebird/User.cxx @@ -16,18 +16,14 @@ using namespace ::connectivity::sdbcx; using namespace ::com::sun::star; using namespace ::com::sun::star::sdbc; -User::User(const uno::Reference< XConnection >& rConnection): +User::User(): OUser(true) // Case Sensitive -{ - (void) rConnection; -} +{} -User::User(const uno::Reference< XConnection >& rConnection, const OUString& rName): +User::User(const OUString& rName): OUser(rName, true) // Case Sensitive -{ - (void) rConnection; -} +{} //----- IRefreshableGroups ---------------------------------------------------- void User::refreshGroups() diff --git a/connectivity/source/drivers/firebird/User.hxx b/connectivity/source/drivers/firebird/User.hxx index 3d2e8db0ea41..8ff9155a14af 100644 --- a/connectivity/source/drivers/firebird/User.hxx +++ b/connectivity/source/drivers/firebird/User.hxx @@ -12,8 +12,6 @@ #include -#include - namespace connectivity { namespace firebird @@ -29,12 +27,11 @@ namespace connectivity /** * Create a "new" descriptor, which isn't yet in the database. */ - explicit User(const css::uno::Reference< css::sdbc::XConnection >& rConnection); + User(); /** * For a user that already exists in the db. */ - User(const css::uno::Reference< css::sdbc::XConnection >& rConnection, - const ::rtl::OUString& rName); + User(const ::rtl::OUString& rName); // IRefreshableGroups:: virtual void refreshGroups() override; diff --git a/connectivity/source/drivers/firebird/Users.cxx b/connectivity/source/drivers/firebird/Users.cxx index 832872c51e66..c0103368c377 100644 --- a/connectivity/source/drivers/firebird/Users.cxx +++ b/connectivity/source/drivers/firebird/Users.cxx @@ -47,7 +47,7 @@ void Users::impl_refresh() ObjectType Users::createObject(const OUString& rName) { - return new User(m_xMetaData->getConnection(), rName); + return new User(rName); } uno::Reference< XPropertySet > Users::createDescriptor() @@ -55,16 +55,14 @@ uno::Reference< XPropertySet > Users::createDescriptor() // There is some internal magic so that the same class can be used as either // a descriptor or as a normal user. See VUser.cxx for the details. In our // case we just need to ensure we use the correct constructor. - return new User(m_xMetaData->getConnection()); + return new User; } //----- XAppend --------------------------------------------------------------- ObjectType Users::appendObject(const OUString& rName, - const uno::Reference< XPropertySet >& rDescriptor) + const uno::Reference< XPropertySet >&) { // TODO: set sSql as appropriate - (void) rName; - (void) rDescriptor; OUString sSql; m_xMetaData->getConnection()->createStatement()->execute(sSql); @@ -72,13 +70,12 @@ ObjectType Users::appendObject(const OUString& rName, } //----- XDrop ----------------------------------------------------------------- -void Users::dropObject(sal_Int32 nPosition, const OUString& sName) +void Users::dropObject(sal_Int32 nPosition, const OUString&) { uno::Reference< XPropertySet > xUser(getObject(nPosition)); if (!ODescriptor::isNew(xUser)) { - (void) sName; // TODO: drop me } } diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index a60f32766e26..5face6249692 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -328,10 +328,9 @@ namespace connectivity { xOrig = xDriver->connect( sConnectURL, aConnectionArgs ); } - catch(const Exception& e) + catch(const Exception&) { StorageContainer::revokeStorage(sKey,nullptr); - (void)e; throw; } diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx index 4b1534a0bad0..2ae4364d9c2d 100644 --- a/connectivity/source/drivers/jdbc/JStatement.cxx +++ b/connectivity/source/drivers/jdbc/JStatement.cxx @@ -133,9 +133,8 @@ Sequence< Type > SAL_CALL java_sql_Statement_Base::getTypes( ) Sequence< Type > aOldTypes = java_sql_Statement_BASE::getTypes(); if ( m_pConnection.is() && !m_pConnection->isAutoRetrievingEnabled() ) { - auto it = std::remove(aOldTypes.getArray(),aOldTypes.getArray() + aOldTypes.getLength(), + (void) std::remove(aOldTypes.getArray(),aOldTypes.getArray() + aOldTypes.getLength(), cppu::UnoType::get()); - (void)it; aOldTypes.realloc(aOldTypes.getLength() - 1); } diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx index b11808da879a..0f6fb73b1a34 100644 --- a/connectivity/source/drivers/mork/MConnection.cxx +++ b/connectivity/source/drivers/mork/MConnection.cxx @@ -61,9 +61,8 @@ void SAL_CALL OConnection::release() throw() } -void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info) +void OConnection::construct(const OUString& url) { - (void) info; // avoid warnings SAL_INFO("connectivity.mork", "=> OConnection::construct()" ); // open file setURL(url); diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx index 37606ea0387b..d53b5671cb99 100644 --- a/connectivity/source/drivers/mork/MConnection.hxx +++ b/connectivity/source/drivers/mork/MConnection.hxx @@ -49,7 +49,7 @@ namespace connectivity public: /// @throws css::sdbc::SQLException - void construct( const OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info); + void construct( const OUString& url); explicit OConnection(MorkDriver* const driver); virtual ~OConnection() override; diff --git a/connectivity/source/drivers/mork/MDriver.cxx b/connectivity/source/drivers/mork/MDriver.cxx index a45f149f6a33..58b714c72df7 100644 --- a/connectivity/source/drivers/mork/MDriver.cxx +++ b/connectivity/source/drivers/mork/MDriver.cxx @@ -45,12 +45,10 @@ css::uno::Sequence< OUString > MorkDriver::getSupportedServiceNames() css::uno::Reference< css::sdbc::XConnection > MorkDriver::connect( OUString const & url, - css::uno::Sequence< css::beans::PropertyValue > const & info) + css::uno::Sequence< css::beans::PropertyValue > const &) { SAL_INFO("connectivity.mork", "=> MorkDriver::connect()" ); - (void) url; (void) info; // avoid warnings - // Profile discovery css::uno::Reference xInstance = context_->getServiceManager()->createInstanceWithContext("com.sun.star.mozilla.MozillaBootstrap", context_); OSL_ENSURE( xInstance.is(), "failed to create instance" ); @@ -72,7 +70,7 @@ css::uno::Reference< css::sdbc::XConnection > MorkDriver::connect( css::uno::Reference< css::sdbc::XConnection > xCon; OConnection* pCon = new OConnection(this); xCon = pCon; // important here because otherwise the connection could be deleted inside (refcount goes -> 0) - pCon->construct(url, info); + pCon->construct(url); return xCon; } @@ -112,11 +110,10 @@ sal_Bool MorkDriver::acceptsURL(OUString const & url) } css::uno::Sequence< css::sdbc::DriverPropertyInfo > MorkDriver::getPropertyInfo( - OUString const & url, - css::uno::Sequence< css::beans::PropertyValue > const & info) + OUString const &, + css::uno::Sequence< css::beans::PropertyValue > const &) { //... TODO - (void) url; (void) info; // avoid warnings return css::uno::Sequence< css::sdbc::DriverPropertyInfo >(); } diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx index a243ecca59aa..b891cc22b580 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx @@ -113,10 +113,8 @@ sal_Bool SAL_CALL MozillaBootstrap::getProfileExists( css::mozilla::MozillaProdu } // XProfileManager -::sal_Int32 SAL_CALL MozillaBootstrap::bootupProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) +::sal_Int32 SAL_CALL MozillaBootstrap::bootupProfile( css::mozilla::MozillaProductType, const OUString& ) { - (void)product; /* avoid warning about unused parameter */ - (void)profileName; /* avoid warning about unused parameter */ return -1; } ::sal_Int32 SAL_CALL MozillaBootstrap::shutdownProfile( ) @@ -135,17 +133,14 @@ sal_Bool SAL_CALL MozillaBootstrap::isCurrentProfileLocked( ) { return true; } -OUString SAL_CALL MozillaBootstrap::setCurrentProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) +OUString SAL_CALL MozillaBootstrap::setCurrentProfile( css::mozilla::MozillaProductType, const OUString& ) { - (void)product; /* avoid warning about unused parameter */ - (void)profileName; /* avoid warning about unused parameter */ return OUString(); } // XProxyRunner -::sal_Int32 SAL_CALL MozillaBootstrap::Run( const css::uno::Reference< css::mozilla::XCodeProxy >& aCode ) +::sal_Int32 SAL_CALL MozillaBootstrap::Run( const css::uno::Reference< css::mozilla::XCodeProxy >& ) { - (void)aCode; /* avoid warning about unused parameter */ return -1; } diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx index d5bf2d95dedd..4a0870e3bf9e 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx @@ -197,10 +197,8 @@ namespace connectivity const ProfileStruct& rProfile = (*rProduct.mProfileList.begin()).second; return rProfile.getProfileName(); } - bool ProfileAccess::isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ) + bool ProfileAccess::isProfileLocked( css::mozilla::MozillaProductType, const OUString& ) { - (void)product; /* avoid warning about unused parameter */ - (void)profileName; /* avoid warning about unused parameter */ return true; } diff --git a/connectivity/source/drivers/odbc/OConnection.cxx b/connectivity/source/drivers/odbc/OConnection.cxx index 581f434a2745..ec9463e243dc 100644 --- a/connectivity/source/drivers/odbc/OConnection.cxx +++ b/connectivity/source/drivers/odbc/OConnection.cxx @@ -75,7 +75,6 @@ OConnection::~OConnection() rc = N3SQLFreeHandle( SQL_HANDLE_DBC, m_aConnectionHandle ); OSL_ENSURE( rc == SQL_SUCCESS , "Failure from SQLFreeHandle for connection"); - (void) rc; m_aConnectionHandle = SQL_NULL_HANDLE; } diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx index 14d725fde1e0..1e0443e651f4 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -601,9 +601,8 @@ sal_Bool DatabaseMetaData::supportsTypeConversion( ) return false; } -sal_Bool DatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) +sal_Bool DatabaseMetaData::supportsConvert( sal_Int32, sal_Int32 ) { - (void) fromType; (void) toType; return false; } @@ -1074,11 +1073,10 @@ sal_Bool DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) } css::uno::Reference< XResultSet > DatabaseMetaData::getProcedures( - const css::uno::Any& catalog, - const OUString& schemaPattern, - const OUString& procedureNamePattern ) + const css::uno::Any&, + const OUString&, + const OUString& ) { - (void) catalog; (void) schemaPattern; (void) procedureNamePattern; // 1. PROCEDURE_CAT string => procedure catalog (may be NULL ) // 2. PROCEDURE_SCHEM string => procedure schema (may be NULL ) // 3. PROCEDURE_NAME string => procedure name @@ -1099,12 +1097,11 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getProcedures( } css::uno::Reference< XResultSet > DatabaseMetaData::getProcedureColumns( - const css::uno::Any& catalog, - const OUString& schemaPattern, - const OUString& procedureNamePattern, - const OUString& columnNamePattern ) + const css::uno::Any&, + const OUString&, + const OUString&, + const OUString& ) { - (void) catalog; (void) schemaPattern; (void) procedureNamePattern; (void) columnNamePattern; MutexGuard guard( m_xMutex->GetMutex() ); // LEM TODO: implement // LEM TODO: at least fake the columns, even if no row. @@ -1113,12 +1110,11 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getProcedureColumns( } css::uno::Reference< XResultSet > DatabaseMetaData::getTables( - const css::uno::Any& catalog, + const css::uno::Any&, const OUString& schemaPattern, const OUString& tableNamePattern, - const css::uno::Sequence< OUString >& types ) + const css::uno::Sequence< OUString >& ) { - (void) catalog; (void) types; Statics &statics = getStatics(); MutexGuard guard( m_xMutex->GetMutex() ); @@ -1446,12 +1442,11 @@ static void columnMetaData2DatabaseTypeDescription( css::uno::Reference< XResultSet > DatabaseMetaData::getColumns( - const css::uno::Any& catalog, + const css::uno::Any&, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) { - (void) catalog; // LEM TODO: review in comparison with JDBC driver Statics &statics = getStatics(); @@ -1632,13 +1627,11 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getColumns( } css::uno::Reference< XResultSet > DatabaseMetaData::getColumnPrivileges( - const css::uno::Any& catalog, + const css::uno::Any&, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) { - (void) catalog; - MutexGuard guard( m_xMutex->GetMutex() ); if (isLog(m_pSettings, LogLevel::Info)) @@ -2247,7 +2240,7 @@ namespace // - BASIC - Supported except for WHERE .. LIKE // - FULL - Supported for all WHERE .. static const sal_Int32 UNSIGNED_ATTRIBUTE = 9; // boolean ==> is it unsigned? - static const sal_Int32 FIXED_PREC_SCALE = 10; // boolean ==> can it be a money value? + // FIXED_PREC_SCALE = 10; boolean ==> can it be a money value? static const sal_Int32 AUTO_INCREMENT = 11; // boolean ==> can it be used for // an auto-increment value? static const sal_Int32 MINIMUM_SCALE = 13; // short ==> minimum scale supported @@ -2307,7 +2300,6 @@ namespace row[MINIMUM_SCALE] <<= OUString("0"); // TODO: what is this ? row[MAXIMUM_SCALE] <<= OUString::number( getMaxScale( dataType ) ); row[NUM_PREC_RADIX] <<= OUString("10"); // TODO: what is this ? - (void)FIXED_PREC_SCALE; vec.push_back( row ); } } @@ -2496,9 +2488,8 @@ sal_Bool DatabaseMetaData::supportsResultSetType( sal_Int32 setType ) } sal_Bool DatabaseMetaData::supportsResultSetConcurrency( - sal_Int32 setType, sal_Int32 concurrency ) + sal_Int32 setType, sal_Int32 ) { - (void) concurrency; if ( ! supportsResultSetType( setType ) ) return false; else diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index b1b3b407a987..5db4c82d3989 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -100,9 +100,8 @@ sal_Bool Driver::acceptsURL( const OUString& url ) } Sequence< DriverPropertyInfo > Driver::getPropertyInfo( - const OUString& url,const Sequence< PropertyValue >& info ) + const OUString&,const Sequence< PropertyValue >& ) { - (void)url; (void)info; return Sequence< DriverPropertyInfo > (); } @@ -214,9 +213,8 @@ private: }; Reference< XInterface > OOneInstanceComponentFactory::createInstanceWithArgumentsAndContext( - Sequence< Any > const &rArguments, const Reference< XComponentContext > & ctx ) + Sequence< Any > const &, const Reference< XComponentContext > & ctx ) { - (void)rArguments; return createInstanceWithContext( ctx ); } diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx index fba81ea56942..34ca29b4e55d 100644 --- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx +++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx @@ -406,9 +406,8 @@ Reference< XConnection > PreparedStatement::getConnection( ) } -void PreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) +void PreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 ) { - (void)sqlType; MutexGuard guard( m_xMutex->GetMutex() ); checkClosed(); checkColumnIndex( parameterIndex ); @@ -416,9 +415,8 @@ void PreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) } void PreparedStatement::setObjectNull( - sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) + sal_Int32 parameterIndex, sal_Int32, const OUString& ) { - (void) sqlType; (void) typeName; MutexGuard guard( m_xMutex->GetMutex() ); checkClosed(); checkColumnIndex( parameterIndex ); @@ -554,22 +552,20 @@ void PreparedStatement::setTimestamp( } void PreparedStatement::setBinaryStream( - sal_Int32 parameterIndex, - const Reference< css::io::XInputStream >& x, - sal_Int32 length ) + sal_Int32, + const Reference< css::io::XInputStream >&, + sal_Int32 ) { - (void) parameterIndex; (void)x; (void) length; throw SQLException( "pq_preparedstatement: setBinaryStream not implemented", *this, OUString(), 1, Any () ); } void PreparedStatement::setCharacterStream( - sal_Int32 parameterIndex, - const Reference< css::io::XInputStream >& x, - sal_Int32 length ) + sal_Int32, + const Reference< css::io::XInputStream >&, + sal_Int32 ) { - (void) parameterIndex; (void)x; (void) length; throw SQLException( "pq_preparedstatement: setCharacterStream not implemented", *this, OUString(), 1, Any () ); @@ -589,9 +585,8 @@ void PreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 targetSqlType, - sal_Int32 scale ) + sal_Int32 ) { - (void) scale; if( css::sdbc::DataType::DECIMAL == targetSqlType || css::sdbc::DataType::NUMERIC == targetSqlType ) { @@ -626,30 +621,27 @@ void PreparedStatement::setObjectWithInfo( } void PreparedStatement::setRef( - sal_Int32 parameterIndex, - const Reference< XRef >& x ) + sal_Int32, + const Reference< XRef >& ) { - (void) parameterIndex; (void)x; throw SQLException( "pq_preparedstatement: setRef not implemented", *this, OUString(), 1, Any () ); } void PreparedStatement::setBlob( - sal_Int32 parameterIndex, - const Reference< XBlob >& x ) + sal_Int32, + const Reference< XBlob >& ) { - (void) parameterIndex; (void)x; throw SQLException( "pq_preparedstatement: setBlob not implemented", *this, OUString(), 1, Any () ); } void PreparedStatement::setClob( - sal_Int32 parameterIndex, - const Reference< XClob >& x ) + sal_Int32, + const Reference< XClob >& ) { - (void) parameterIndex; (void)x; throw SQLException( "pq_preparedstatement: setClob not implemented", *this, OUString(), 1, Any () ); diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx index 646444bf0542..6b46bd2f5654 100644 --- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx @@ -293,15 +293,13 @@ sal_Bool ResultSetMetaData::isAutoIncrement( sal_Int32 column ) return ret; } -sal_Bool ResultSetMetaData::isCaseSensitive( sal_Int32 column ) +sal_Bool ResultSetMetaData::isCaseSensitive( sal_Int32 ) { - (void) column; return true; // ??? hmm, numeric types or } -sal_Bool ResultSetMetaData::isSearchable( sal_Int32 column ) +sal_Bool ResultSetMetaData::isSearchable( sal_Int32 ) { - (void) column; return true; // mmm, what types are not searchable ? } @@ -316,9 +314,8 @@ sal_Int32 ResultSetMetaData::isNullable( sal_Int32 column ) getStatics().IS_NULLABLE, column, css::sdbc::ColumnValue::NULLABLE_UNKNOWN ); } -sal_Bool ResultSetMetaData::isSigned( sal_Int32 column ) +sal_Bool ResultSetMetaData::isSigned( sal_Int32 ) { - (void) column; return true; } @@ -342,9 +339,8 @@ OUString ResultSetMetaData::getColumnName( sal_Int32 column ) return m_colDesc[column-1].name; } -OUString ResultSetMetaData::getSchemaName( sal_Int32 column ) +OUString ResultSetMetaData::getSchemaName( sal_Int32 ) { - (void) column; return m_schemaName; } @@ -412,9 +408,8 @@ OUString ResultSetMetaData::getColumnTypeName( sal_Int32 column ) } -sal_Bool ResultSetMetaData::isReadOnly( sal_Int32 column ) +sal_Bool ResultSetMetaData::isReadOnly( sal_Int32 ) { - (void) column; return false; } @@ -427,9 +422,8 @@ sal_Bool ResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) { return isWritable(column); // uhh, now it becomes really esoteric .... } -OUString ResultSetMetaData::getColumnServiceName( sal_Int32 column ) +OUString ResultSetMetaData::getColumnServiceName( sal_Int32 ) { - (void) column; return OUString(); } diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx index 1bc732dbdcc3..bab35147b26b 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx @@ -169,9 +169,8 @@ void IndexColumns::appendByDescriptor( } -void IndexColumns::dropByName( const OUString& elementName ) +void IndexColumns::dropByName( const OUString& ) { - (void) elementName; throw css::sdbc::SQLException( "SDBC-POSTGRESQL: IndexesColumns.dropByName not yet implemented", *this, OUString(), 1, Any() ); @@ -192,9 +191,8 @@ void IndexColumns::dropByName( const OUString& elementName ) // dropByIndex( ii->second ); } -void IndexColumns::dropByIndex( sal_Int32 index ) +void IndexColumns::dropByIndex( sal_Int32 ) { - (void) index; throw css::sdbc::SQLException( "SDBC-POSTGRESQL: IndexesColumns.dropByIndex not yet implemented", *this, OUString(), 1, Any() ); diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.cxx b/connectivity/source/drivers/postgresql/pq_xindexes.cxx index 126e895d6e19..ac44329f5676 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexes.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindexes.cxx @@ -135,8 +135,8 @@ void Indexes::refresh() sal_Int32 index = 0; while( rs->next() ) { - static const sal_Int32 C_SCHEMA = 1; - static const sal_Int32 C_TABLENAME = 2; + // C_SCHEMA = 1 + // C_TABLENAME = 2 static const sal_Int32 C_INDEXNAME = 3; static const sal_Int32 C_IS_CLUSTERED = 4; static const sal_Int32 C_IS_UNIQUE = 5; @@ -147,7 +147,6 @@ void Indexes::refresh() new Index( m_xMutex, m_origin, m_pSettings, m_schemaName, m_tableName ); - (void) C_SCHEMA; (void) C_TABLENAME; bool isUnique = row->getBoolean( C_IS_UNIQUE ); bool isPrimary = row->getBoolean( C_IS_PRIMARY ); bool isClusterd = row->getBoolean( C_IS_CLUSTERED ); diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx index 0ae1af1ffdb2..782861615707 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx @@ -157,9 +157,8 @@ void KeyColumns::refresh() void KeyColumns::appendByDescriptor( - const css::uno::Reference< css::beans::XPropertySet >& future ) + const css::uno::Reference< css::beans::XPropertySet >& ) { - (void) future; throw css::sdbc::SQLException( "KeyColumns::appendByDescriptor not implemented yet", *this, OUString(), 1, Any() ); @@ -174,9 +173,8 @@ void KeyColumns::appendByDescriptor( } -void KeyColumns::dropByIndex( sal_Int32 index ) +void KeyColumns::dropByIndex( sal_Int32 ) { - (void) index; throw css::sdbc::SQLException( "KeyColumns::dropByIndex not implemented yet", *this, OUString(), 1, Any() ); diff --git a/connectivity/source/drivers/postgresql/pq_xuser.cxx b/connectivity/source/drivers/postgresql/pq_xuser.cxx index d310dada9aaf..52f1470c14e6 100644 --- a/connectivity/source/drivers/postgresql/pq_xuser.cxx +++ b/connectivity/source/drivers/postgresql/pq_xuser.cxx @@ -120,9 +120,8 @@ Any User::queryInterface( const Type & reqType ) void User::changePassword( - const OUString& oldPassword, const OUString& newPassword ) + const OUString&, const OUString& newPassword ) { - (void) oldPassword; OUStringBuffer buf(128); buf.append( "ALTER USER " ); bufferQuoteIdentifier( buf, extractStringProperty( this, getStatics().NAME ), m_pSettings ); @@ -149,23 +148,20 @@ sal_Int32 User::getPrivileges( const OUString& objName, sal_Int32 objType ) return 0xffffffff; } -sal_Int32 User::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) +sal_Int32 User::getGrantablePrivileges( const OUString&, sal_Int32 ) { - (void) objName; (void) objType; // all privileges return 0xffffffff; } -void User::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) +void User::grantPrivileges( const OUString&, sal_Int32, sal_Int32 ) { - (void) objName; (void) objType; (void) objPrivileges; throw css::sdbc::SQLException("pq_driver: privilege change not implemented yet", *this, OUString(), 1, Any() ); } -void User::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) +void User::revokePrivileges( const OUString&, sal_Int32, sal_Int32 ) { - (void) objName; (void) objType; (void) objPrivileges; throw css::sdbc::SQLException("pq_driver: privilege change not implemented yet", *this, OUString(), 1, Any() ); } diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index 04011ed2b482..eaaeabab365a 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -1346,7 +1346,6 @@ void OSQLParseTreeIterator::traverseSearchCondition(OSQLParseNode * pSearchCondi { OSL_ENSURE(pSearchCondition->count() == 2,"OSQLParseTreeIterator: error in parse tree!"); const OSQLParseNode* pPart2 = pSearchCondition->getChild(1); - (void)pPart2; OSL_ENSURE(SQL_ISTOKEN(pPart2->getChild(0),IS),"OSQLParseTreeIterator: error in parse tree!"); OUString aString; -- cgit v1.2.3