summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-26 16:01:56 +0200
committerAshod Nakashian <ashod.nakashian@collabora.co.uk>2016-07-12 22:06:27 -0400
commit3fd52924e45a9a29a255156c1a9bcff9d8855019 (patch)
tree30cf82f2bc565847a16dfed7088093ba7b11d297 /connectivity
parent892124072c459ddf818557a3eb0f78c6dc815a52 (diff)
loplugin:unusedfields
Change-Id: Icac4ac1a2614e72bc9ff070819533e09eeb1a864 (cherry picked from commit ec3f72415850bd865eb030cf2b7edb55b99d4756)
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/drivers/firebird/Connection.cxx2
-rw-r--r--connectivity/source/drivers/firebird/Connection.hxx7
-rw-r--r--connectivity/source/drivers/firebird/PreparedStatement.cxx2
-rw-r--r--connectivity/source/drivers/firebird/PreparedStatement.hxx19
-rw-r--r--connectivity/source/drivers/firebird/StatementCommonBase.cxx3
-rw-r--r--connectivity/source/drivers/firebird/StatementCommonBase.hxx3
-rw-r--r--connectivity/source/drivers/firebird/SubComponent.hxx9
-rw-r--r--connectivity/source/drivers/mork/MConnection.hxx1
-rw-r--r--connectivity/source/drivers/mork/MPreparedStatement.cxx2
-rw-r--r--connectivity/source/drivers/mork/MPreparedStatement.hxx17
-rw-r--r--connectivity/source/drivers/mork/MQueryHelper.hxx1
-rw-r--r--connectivity/source/drivers/mork/MResultSet.cxx1
-rw-r--r--connectivity/source/drivers/mork/MResultSet.hxx1
-rw-r--r--connectivity/source/drivers/mork/MStatement.cxx1
-rw-r--r--connectivity/source/drivers/mork/MStatement.hxx4
-rw-r--r--connectivity/source/drivers/postgresql/pq_statics.cxx4
-rw-r--r--connectivity/source/drivers/postgresql/pq_statics.hxx19
-rw-r--r--connectivity/source/inc/file/FConnection.hxx2
18 files changed, 6 insertions, 92 deletions
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index 91555c65394b..469efb226b78 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -86,7 +86,6 @@ Connection::Connection(FirebirdDriver* _pDriver)
, m_bIsEmbedded(false)
, m_xEmbeddedStorage(nullptr)
, m_bIsFile(false)
- , m_sUser()
, m_bIsAutoCommit(false)
, m_bIsReadOnly(false)
, m_aTransactionIsolation(TransactionIsolation::REPEATABLE_READ)
@@ -408,7 +407,6 @@ Reference< XPreparedStatement > SAL_CALL Connection::prepareStatement(
OUString sSqlStatement (transformPreparedStatement( _sSql ));
Reference< XPreparedStatement > xReturn = new OPreparedStatement(this,
- m_aTypeInfo,
sSqlStatement);
m_aStatements.push_back(WeakReferenceHelper(xReturn));
diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx
index 6cd5d699357b..f1954ad37078 100644
--- a/connectivity/source/drivers/firebird/Connection.hxx
+++ b/connectivity/source/drivers/firebird/Connection.hxx
@@ -124,12 +124,9 @@ namespace connectivity
/** We are using an external (local) file */
bool m_bIsFile;
- /* REMOTE CONNECTION DATA */
- ::rtl::OUString m_sUser;
-
/* CONNECTION PROPERTIES */
- bool m_bIsAutoCommit;
- bool m_bIsReadOnly;
+ bool m_bIsAutoCommit;
+ bool m_bIsReadOnly;
sal_Int32 m_aTransactionIsolation;
isc_db_handle m_aDBHandle;
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 7b9218cc9518..6ebc8ac7303d 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -51,10 +51,8 @@ IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.firebird.PreparedS
OPreparedStatement::OPreparedStatement( Connection* _pConnection,
- const TTypeInfoVector& _TypeInfo,
const OUString& sql)
:OStatementCommonBase(_pConnection)
- ,m_aTypeInfo(_TypeInfo)
,m_sSqlStatement(sql)
,m_pOutSqlda(nullptr)
,m_pInSqlda(nullptr)
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.hxx b/connectivity/source/drivers/firebird/PreparedStatement.hxx
index e08236b0f15c..e0711a7ecaf6 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.hxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.hxx
@@ -48,24 +48,6 @@ namespace connectivity
public OPreparedStatement_Base
{
protected:
- struct Parameter
- {
- ::com::sun::star::uno::Any aValue;
- sal_Int32 nDataType;
-
- Parameter(const ::com::sun::star::uno::Any& rValue,
- sal_Int32 rDataType) : aValue(rValue),nDataType(rDataType)
- {
- }
-
- };
-
- ::std::vector< Parameter> m_aParameters;
-
- TTypeInfoVector m_aTypeInfo; // Hashtable containing an entry
- // for each row returned by
- // DatabaseMetaData.getTypeInfo.
-
::rtl::OUString m_sSqlStatement;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData;
@@ -105,7 +87,6 @@ namespace connectivity
DECLARE_SERVICE_INFO();
// a constructor, which is required for returning objects:
OPreparedStatement( Connection* _pConnection,
- const TTypeInfoVector& _TypeInfo,
const ::rtl::OUString& sql);
//XInterface
diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
index 48b7391932e8..61a963c30176 100644
--- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx
+++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
@@ -47,8 +47,7 @@ OStatementCommonBase::OStatementCommonBase(Connection* _pConnection)
: OStatementCommonBase_Base(m_aMutex),
OPropertySetHelper(OStatementCommonBase_Base::rBHelper),
m_pConnection(_pConnection),
- m_aStatementHandle( 0 ),
- rBHelper(OStatementCommonBase_Base::rBHelper)
+ m_aStatementHandle( 0 )
{
}
diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.hxx b/connectivity/source/drivers/firebird/StatementCommonBase.hxx
index e849b341ba91..1a7ccc0fdc5c 100644
--- a/connectivity/source/drivers/firebird/StatementCommonBase.hxx
+++ b/connectivity/source/drivers/firebird/StatementCommonBase.hxx
@@ -58,8 +58,6 @@ namespace connectivity
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xResultSet; // The last ResultSet created
// for this Statement
- ::std::list< ::rtl::OUString> m_aBatchList;
-
::rtl::Reference<Connection> m_pConnection;
ISC_STATUS_ARRAY m_statusVector;
@@ -103,7 +101,6 @@ namespace connectivity
public:
- ::cppu::OBroadcastHelper& rBHelper;
explicit OStatementCommonBase(Connection* _pConnection);
using OStatementCommonBase_Base::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >;
diff --git a/connectivity/source/drivers/firebird/SubComponent.hxx b/connectivity/source/drivers/firebird/SubComponent.hxx
index 7e461132af7a..ba34a19914c4 100644
--- a/connectivity/source/drivers/firebird/SubComponent.hxx
+++ b/connectivity/source/drivers/firebird/SubComponent.hxx
@@ -132,15 +132,6 @@ namespace connectivity
return s_pProps;
}
- class OBase_Mutex
- {
- public:
- ::osl::Mutex m_aMutex;
- };
-
-
-
-
}
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_SUBCOMPONENT_HXX
diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx
index ad65d18258d6..27eb262b9488 100644
--- a/connectivity/source/drivers/mork/MConnection.hxx
+++ b/connectivity/source/drivers/mork/MConnection.hxx
@@ -44,7 +44,6 @@ namespace connectivity
// Data attributes
- ::com::sun::star::sdbc::SQLWarning m_aLastWarning;
MorkDriver* m_pDriver; // Pointer to the owning
// driver object
OColumnAlias m_aColumnAlias;
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx
index 50b2fafde8ee..142a8ef0eca4 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx
@@ -43,9 +43,7 @@ IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.mork.PreparedState
OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OUString& sql)
:OCommonStatement(_pConnection)
- ,m_nNumParams(0)
,m_sSqlStatement(sql)
- ,m_bPrepared(false)
,m_pResultSet()
{
}
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.hxx b/connectivity/source/drivers/mork/MPreparedStatement.hxx
index 186b32fce139..9e7e7f60d3a9 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.hxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.hxx
@@ -44,27 +44,10 @@ namespace connectivity
public OPreparedStatement_BASE
{
protected:
- struct Parameter
- {
- ::com::sun::star::uno::Any aValue;
- sal_Int32 nDataType;
-
- Parameter(const ::com::sun::star::uno::Any& rValue,
- sal_Int32 rDataType) : aValue(rValue),nDataType(rDataType)
- {
- }
-
- };
-
- ::std::vector< Parameter> m_aParameters;
-
// Data attributes
- sal_Int32 m_nNumParams; // Number of parameter markers for the prepared statement
-
OUString m_sSqlStatement;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData;
- bool m_bPrepared;
::rtl::Reference< OResultSet > m_pResultSet;
::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns; // the parameter columns
OValueRow m_aParameterRow;
diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx
index ebadf2a0b436..419de30eb651 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.hxx
@@ -169,7 +169,6 @@ namespace connectivity
typedef std::vector< MQueryHelperResultEntry* > resultsArray;
mutable ::osl::Mutex m_aMutex;
- ::osl::Condition m_aCondition;
resultsArray m_aResults;
sal_uInt32 m_nIndex;
bool m_bHasMore;
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index f293f0f4c1c6..bb6817184874 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -108,7 +108,6 @@ OResultSet::OResultSet(OCommonStatement* pStmt, const std::shared_ptr< connectiv
,m_pKeySet(nullptr)
,m_nNewRow(0)
,m_nUpdatedRow(0)
- ,m_RowStates(0)
,m_bIsReadOnly(TRISTATE_INDET)
{
//m_aQuery.setMaxNrOfReturns(pStmt->getOwnConnection()->getMaxResultRecords());
diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx
index ea00095a6b7a..86563cd78cf6 100644
--- a/connectivity/source/drivers/mork/MResultSet.hxx
+++ b/connectivity/source/drivers/mork/MResultSet.hxx
@@ -240,7 +240,6 @@ protected:
::rtl::Reference<OKeySet> m_pKeySet;
sal_Int32 m_nNewRow; //inserted row
sal_Int32 m_nUpdatedRow; //updated row
- sal_Int32 m_RowStates;
TriState m_bIsReadOnly;
inline void resetParameters() { m_nParamIndex = 0; }
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index 2fd13f872b94..019175ce88db 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -81,7 +81,6 @@ OCommonStatement::OCommonStatement(OConnection* _pConnection )
,m_pConnection(_pConnection)
,m_aParser( comphelper::getComponentContext(_pConnection->getDriver()->getFactory()) )
,m_pSQLIterator( new OSQLParseTreeIterator( _pConnection, _pConnection->createCatalog()->getTables(), m_aParser, nullptr ) )
- ,rBHelper(OCommonStatement_IBASE::rBHelper)
{
m_xDBMetaData = _pConnection->getMetaData();
m_pParseTree = nullptr;
diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx
index 8ff6831b3723..abe436069687 100644
--- a/connectivity/source/drivers/mork/MStatement.hxx
+++ b/connectivity/source/drivers/mork/MStatement.hxx
@@ -76,8 +76,6 @@ namespace connectivity
// for this Statement
- ::std::list< OUString> m_aBatchList;
-
OTable* m_pTable;
OConnection* m_pConnection; // The owning Connection object
@@ -93,8 +91,6 @@ namespace connectivity
::std::vector<sal_Int32> m_aOrderbyColumnNumber;
::std::vector<TAscendingOrder> m_aOrderbyAscending;
- ::cppu::OBroadcastHelper& rBHelper;
-
protected:
// OPropertyArrayUsageHelper
diff --git a/connectivity/source/drivers/postgresql/pq_statics.cxx b/connectivity/source/drivers/postgresql/pq_statics.cxx
index 1eeabfa69219..ec878c37d5bf 100644
--- a/connectivity/source/drivers/postgresql/pq_statics.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statics.cxx
@@ -714,9 +714,7 @@ Statics & getStatics()
defTypeInfoMetaData[i].scale,
defTypeInfoMetaData[i].isCurrency,
defTypeInfoMetaData[i].isNullable,
- defTypeInfoMetaData[i].isAutoIncrement,
- defTypeInfoMetaData[i].isReadOnly,
- defTypeInfoMetaData[i].isSigned ) );
+ defTypeInfoMetaData[i].isAutoIncrement ) );
}
p = &statics;
diff --git a/connectivity/source/drivers/postgresql/pq_statics.hxx b/connectivity/source/drivers/postgresql/pq_statics.hxx
index 505eceafd8f2..2b4a75bc393e 100644
--- a/connectivity/source/drivers/postgresql/pq_statics.hxx
+++ b/connectivity/source/drivers/postgresql/pq_statics.hxx
@@ -61,9 +61,7 @@ struct ColumnMetaData
sal_Int32 _scale,
bool _isCurrency,
bool _isNullable,
- bool _isAutoIncrement,
- bool _isReadOnly,
- bool _isSigned ) :
+ bool _isAutoIncrement ) :
columnName( _columnName ),
tableName( _tableName ),
schemaTableName( _schemaTableName ),
@@ -73,9 +71,7 @@ struct ColumnMetaData
scale( _scale ),
isCurrency( _isCurrency ),
isNullable( _isNullable ),
- isAutoIncrement( _isAutoIncrement ),
- isReadOnly( _isReadOnly ),
- isSigned( _isSigned )
+ isAutoIncrement( _isAutoIncrement )
{}
OUString columnName;
@@ -88,21 +84,10 @@ struct ColumnMetaData
bool isCurrency;
bool isNullable;
bool isAutoIncrement;
- bool isReadOnly;
- bool isSigned;
};
typedef std::vector< ColumnMetaData > ColumnMetaDataVector;
-struct TypeDetails
-{
- sal_Int32 dataType;
- sal_Int32 minScale;
- sal_Int32 maxScale; // in case nothing is given in getTypeInfo
- bool isAutoIncrement;
- bool isSearchable;
-};
-
typedef std::unordered_map
<
OUString,
diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx
index 034dbb4cb40b..58a57fce4201 100644
--- a/connectivity/source/inc/file/FConnection.hxx
+++ b/connectivity/source/inc/file/FConnection.hxx
@@ -54,8 +54,6 @@ namespace connectivity
::com::sun::star::uno::WeakReference< ::com::sun::star::sdbcx::XTablesSupplier> m_xCatalog;
- ::com::sun::star::sdbc::SQLWarning m_aLastWarning; // Last SQLWarning generated by
-
OUString m_aFilenameExtension;
OFileDriver* m_pDriver; // Pointer to the owning
// driver object