From 21e0d8162a0e683558c4d042ce688fc9a6833809 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 3 Jan 2018 14:08:19 +0200 Subject: loplugin:unusedfields fix the ReturnStmt check Change-Id: I95076076bd1313d23798c4615ea12910c86ed9a8 Reviewed-on: https://gerrit.libreoffice.org/47309 Tested-by: Jenkins Reviewed-by: Noel Grandin --- .../commontools/FDatabaseMetaDataResultSetMetaData.cxx | 8 ++------ .../source/drivers/ado/ADatabaseMetaDataImpl.cxx | 16 ++++------------ connectivity/source/drivers/mork/MConnection.cxx | 17 +---------------- connectivity/source/drivers/mork/MErrorResource.hxx | 3 --- connectivity/source/inc/OColumn.hxx | 11 ----------- 5 files changed, 7 insertions(+), 48 deletions(-) (limited to 'connectivity') diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx index 812009d423ab..3a034b45d9a3 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx @@ -85,10 +85,8 @@ OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 return OUString(); } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column ) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 /*column*/ ) { - if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) - return (*m_mColumnsIter).second.getColumnTypeName(); return OUString(); } @@ -99,10 +97,8 @@ OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 return getColumnName(column); } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column ) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) { - if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) - return (*m_mColumnsIter).second.getColumnServiceName(); return OUString(); } diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx index cbb9c9ff116b..cadf6fe2c793 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx @@ -269,10 +269,8 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isAutoIncrement( sal_Int32 return false; } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column ) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) { - if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) - return (*m_mColumnsIter).second.getColumnServiceName(); return OUString(); } @@ -283,17 +281,13 @@ OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 co return OUString(); } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 column ) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) { - if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) - return (*m_mColumnsIter).second.getCatalogName(); return OUString(); } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column ) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 /*column*/ ) { - if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) - return (*m_mColumnsIter).second.getColumnTypeName(); return OUString(); } @@ -306,10 +300,8 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32 } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 column ) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) { - if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) - return (*m_mColumnsIter).second.getSchemaName(); return OUString(); } diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx index 95718217d445..8ede63eb25fb 100644 --- a/connectivity/source/drivers/mork/MConnection.cxx +++ b/connectivity/source/drivers/mork/MConnection.cxx @@ -373,17 +373,6 @@ void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Refer OSL_ENSURE( ( _rError.getErrorCondition() == 0 ), "OConnection::throwSQLException: unsupported error code combination!" ); - const OUString& sParameter( _rError.getParameter() ); - if ( !sParameter.isEmpty() ) - { - const OUString sError( getResources().getResourceStringWithSubstitution( - _rError.getResId(), - "$1$", sParameter - ) ); - ::dbtools::throwGenericSQLException( sError, _rxContext ); - OSL_FAIL( "OConnection::throwSQLException: unreachable (1)!" ); - } - throwGenericSQLException( _rError.getResId(), _rxContext ); OSL_FAIL( "OConnection::throwSQLException: unreachable (2)!" ); } @@ -391,11 +380,7 @@ void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Refer if ( _rError.getErrorCondition() != 0 ) { SQLError aErrorHelper; - const OUString& sParameter( _rError.getParameter() ); - if ( !sParameter.isEmpty() ) - aErrorHelper.raiseException( _rError.getErrorCondition(), _rxContext, sParameter ); - else - aErrorHelper.raiseException( _rError.getErrorCondition(), _rxContext); + aErrorHelper.raiseException( _rError.getErrorCondition(), _rxContext); OSL_FAIL( "OConnection::throwSQLException: unreachable (3)!" ); } diff --git a/connectivity/source/drivers/mork/MErrorResource.hxx b/connectivity/source/drivers/mork/MErrorResource.hxx index aa4c7c201572..f8ab0a7ef983 100644 --- a/connectivity/source/drivers/mork/MErrorResource.hxx +++ b/connectivity/source/drivers/mork/MErrorResource.hxx @@ -29,13 +29,11 @@ namespace connectivity private: const char* m_pErrorResourceId; sal_Int32 m_nErrorCondition; - OUString m_sParameter; public: ErrorDescriptor() :m_pErrorResourceId(nullptr) ,m_nErrorCondition(0) - ,m_sParameter() { } @@ -51,7 +49,6 @@ namespace connectivity const char* getResId() const { return m_pErrorResourceId; } sal_Int32 getErrorCondition() const { return m_nErrorCondition; } - const OUString& getParameter() const { return m_sParameter; } bool is() const { return ( m_pErrorResourceId != nullptr ) || ( m_nErrorCondition != 0 ); } }; diff --git a/connectivity/source/inc/OColumn.hxx b/connectivity/source/inc/OColumn.hxx index cd1bd903ad1a..375f6ce9dc5a 100644 --- a/connectivity/source/inc/OColumn.hxx +++ b/connectivity/source/inc/OColumn.hxx @@ -28,13 +28,9 @@ namespace connectivity { class OOO_DLLPUBLIC_DBTOOLS OColumn { - OUString m_CatalogName; - OUString m_SchemaName; OUString m_TableName; OUString m_ColumnName; OUString m_ColumnLabel; - OUString m_ColumnTypeName; - OUString m_ColumnServiceName; sal_Int32 m_Nullable; sal_Int32 m_ColumnDisplaySize; @@ -79,8 +75,6 @@ namespace connectivity : m_TableName(_aTableName), m_ColumnName(_aColumnName), m_ColumnLabel(), - m_ColumnTypeName(), - m_ColumnServiceName(), m_Nullable(_aNullable), m_ColumnDisplaySize(_aColumnDisplaySize), @@ -127,12 +121,7 @@ namespace connectivity const OUString& getColumnLabel() const { return m_ColumnLabel; } const OUString& getColumnName() const { return m_ColumnName; } - const OUString& getSchemaName() const { return m_SchemaName; } const OUString& getTableName() const { return m_TableName; } - const OUString& getCatalogName() const { return m_CatalogName; } - const OUString& getColumnTypeName() const { return m_ColumnTypeName; } - const OUString& getColumnServiceName() const { return m_ColumnServiceName; } - }; } -- cgit