summaryrefslogtreecommitdiffstats
path: root/connectivity
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-12-23 08:13:30 +0200
committerNoel Grandin <noel@peralex.com>2015-12-23 08:13:54 +0200
commitdaa90e38cc85664be743ad1ef19a9c531b0b2b17 (patch)
tree7226fe780e333ddbedab913f8075859f50945f5e /connectivity
parentloplugin:unusedfields in cui (diff)
downloadcore-daa90e38cc85664be743ad1ef19a9c531b0b2b17.tar.gz
core-daa90e38cc85664be743ad1ef19a9c531b0b2b17.zip
loplugin:unusedfields in connectivity
Change-Id: I32226b6959b2bfd316de6ed93b070b68ad875562
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/drivers/file/FDriver.cxx1
-rw-r--r--connectivity/source/drivers/file/FResultSet.cxx1
-rw-r--r--connectivity/source/drivers/jdbc/PreparedStatement.cxx2
-rw-r--r--connectivity/source/drivers/jdbc/ResultSet.cxx2
-rw-r--r--connectivity/source/drivers/jdbc/ResultSetMetaData.cxx3
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx11
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx5
-rw-r--r--connectivity/source/drivers/odbc/OResultSet.cxx1
-rw-r--r--connectivity/source/drivers/odbc/OStatement.cxx1
-rw-r--r--connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx2
-rw-r--r--connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx2
-rw-r--r--connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx3
-rw-r--r--connectivity/source/drivers/postgresql/pq_statics.cxx40
-rw-r--r--connectivity/source/drivers/postgresql/pq_xindex.hxx1
-rw-r--r--connectivity/source/drivers/postgresql/pq_xkey.hxx1
-rw-r--r--connectivity/source/drivers/postgresql/pq_xtable.hxx1
-rw-r--r--connectivity/source/inc/RowFunctionParser.hxx5
-rw-r--r--connectivity/source/inc/file/FResultSet.hxx1
-rw-r--r--connectivity/source/inc/file/fcode.hxx3
-rw-r--r--connectivity/source/inc/java/sql/ResultSetMetaData.hxx3
-rw-r--r--connectivity/source/inc/odbc/OBoundParam.hxx9
-rw-r--r--connectivity/source/inc/odbc/OConnection.hxx5
-rw-r--r--connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx2
-rw-r--r--connectivity/source/inc/odbc/OPreparedStatement.hxx13
-rw-r--r--connectivity/source/inc/odbc/OResultSet.hxx1
-rw-r--r--connectivity/source/inc/odbc/OStatement.hxx1
26 files changed, 31 insertions, 89 deletions
diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx
index 56299a018dcd..decf7f268011 100644
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
@@ -225,7 +225,6 @@ Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByURL( const
OOperandAttr::OOperandAttr(sal_uInt16 _nPos,const Reference< XPropertySet>& _xColumn)
: OOperandRow(_nPos,::comphelper::getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))))
- , m_xColumn(_xColumn)
{
}
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index a82034fc1476..688ff8a6eaac 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -90,7 +90,6 @@ OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator& _aSQLIte
,m_nResultSetConcurrency(ResultSetConcurrency::UPDATABLE)
,m_xStatement(*pStmt)
,m_xMetaData(nullptr)
- ,m_xDBMetaData(pStmt->getOwnConnection()->getMetaData())
,m_nRowPos(-1)
,m_nFilePos(0)
,m_nLastVisitedPos(-1)
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 9aa42c8bc030..b92f3f661fb7 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -637,7 +637,7 @@ void SAL_CALL java_sql_PreparedStatement::addBatch( ) throw(::com::sun::star::sd
static jmethodID mID(nullptr);
jobject out = callObjectMethod(t.pEnv,"getMetaData","()Ljava/sql/ResultSetMetaData;", mID);
- return out==nullptr ? nullptr : new java_sql_ResultSetMetaData( t.pEnv, out, m_aLogger,*m_pConnection );
+ return out==nullptr ? nullptr : new java_sql_ResultSetMetaData( t.pEnv, out, *m_pConnection );
}
void SAL_CALL java_sql_PreparedStatement::acquire() throw()
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index 88fbf7d72d6c..1d18bb1ffdb1 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -242,7 +242,7 @@ sal_Int64 SAL_CALL java_sql_ResultSet::getLong( sal_Int32 columnIndex ) throw(SQ
static jmethodID mID(nullptr);
jobject out = callObjectMethod(t.pEnv,"getMetaData","()Ljava/sql/ResultSetMetaData;", mID);
- return out==nullptr ? nullptr : new java_sql_ResultSetMetaData( t.pEnv, out, m_aLogger,*m_pConnection );
+ return out==nullptr ? nullptr : new java_sql_ResultSetMetaData( t.pEnv, out, *m_pConnection );
}
Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
index fa72a45eb23f..b504527e97a0 100644
--- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
@@ -33,9 +33,8 @@ using namespace ::com::sun::star::lang;
jclass java_sql_ResultSetMetaData::theClass = nullptr;
-java_sql_ResultSetMetaData::java_sql_ResultSetMetaData( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rResultSetLogger, java_sql_Connection& _rCon )
+java_sql_ResultSetMetaData::java_sql_ResultSetMetaData( JNIEnv * pEnv, jobject myObj, java_sql_Connection& _rCon )
:java_lang_Object( pEnv, myObj )
- ,m_aLogger( _rResultSetLogger )
,m_pConnection( &_rCon )
,m_nColumnCount(-1)
{
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
index 25e2cc310699..d1a9b7ede5d1 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
@@ -36,21 +36,20 @@ using ::com::sun::star::lang::XMultiServiceFactory;
static MozillaBootstrap *pMozillaBootstrap=nullptr;
static Reference<XMozillaBootstrap> xMozillaBootstrap;
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL OMozillaBootstrap_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory)
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL OMozillaBootstrap_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& )
{
if (!pMozillaBootstrap)
{
- pMozillaBootstrap=new connectivity::mozab::MozillaBootstrap( _rxFactory );
+ pMozillaBootstrap=new connectivity::mozab::MozillaBootstrap;
pMozillaBootstrap->Init();
xMozillaBootstrap = pMozillaBootstrap;
}
return pMozillaBootstrap;
}
-MozillaBootstrap::MozillaBootstrap(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory)
- : OMozillaBootstrap_BASE(m_aMutex), m_xMSFactory( _rxFactory ),
- m_ProfileAccess(nullptr), m_ProfileManager(nullptr)
+MozillaBootstrap::MozillaBootstrap()
+ : OMozillaBootstrap_BASE(m_aMutex),
+ m_ProfileAccess(nullptr)
{
}
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
index aa9df938c22a..e887aec00910 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
@@ -38,17 +38,14 @@ namespace connectivity
class MozillaBootstrap : public OMozillaBootstrap_BASE
{
protected:
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xMSFactory;
-
::osl::Mutex m_aMutex; // mutex is need to control member access
virtual ~MozillaBootstrap();
protected:
ProfileAccess * m_ProfileAccess;
- ProfileManager * m_ProfileManager;
public:
void Init();
- explicit MozillaBootstrap(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory);
+ MozillaBootstrap();
// OComponentHelper
virtual void SAL_CALL disposing() override;
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index 39c04609c429..1993c73107dd 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -97,7 +97,6 @@ OResultSet::OResultSet(SQLHANDLE _pStatementHandle ,OStatement_Base* pStmt) :
,m_nCurrentFetchState(0)
,m_bWasNull(true)
,m_bEOF(true)
- ,m_bLastRecord(false)
,m_bFreeHandle(false)
,m_bInserting(false)
,m_bRowInserted(false)
diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx
index 301522d14515..0aa9f00317c1 100644
--- a/connectivity/source/drivers/odbc/OStatement.cxx
+++ b/connectivity/source/drivers/odbc/OStatement.cxx
@@ -62,7 +62,6 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection )
,m_pConnection(_pConnection)
,m_aStatementHandle(SQL_NULL_HANDLE)
,m_pRowStatusArray(nullptr)
- ,rBHelper(OStatement_BASE::rBHelper)
{
osl_atomic_increment( &m_refCount );
m_pConnection->acquire();
diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx
index 73a2647dd30f..4175b5e2e305 100644
--- a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx
@@ -76,7 +76,7 @@ SequenceResultSet::SequenceResultSet(
{
if( pVec )
{
- m_meta = new SequenceResultSetMetaData( mutex, *pVec, m_columnNames.getLength() );
+ m_meta = new SequenceResultSetMetaData( *pVec, m_columnNames.getLength() );
}
}
diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx
index 548aee69001a..dabb16da1637 100644
--- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx
@@ -48,10 +48,8 @@ namespace pq_sdbc_driver
{
SequenceResultSetMetaData::SequenceResultSetMetaData(
- const ::rtl::Reference< RefCountedMutex > & refMutex,
const ColumnMetaDataVector &metaDataVector,
int colCount ) :
- m_refMutex( refMutex ),
m_columnData( metaDataVector ),
m_colCount( colCount )
{
diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx
index e943adb71935..7f1cf63f22b7 100644
--- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx
+++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx
@@ -48,8 +48,6 @@ namespace pq_sdbc_driver
class SequenceResultSetMetaData :
public ::cppu::WeakImplHelper< com::sun::star::sdbc::XResultSetMetaData >
{
- ::rtl::Reference< RefCountedMutex > m_refMutex;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_origin;
ColumnMetaDataVector m_columnData;
sal_Int32 m_colCount;
@@ -58,7 +56,6 @@ namespace pq_sdbc_driver
public:
SequenceResultSetMetaData(
- const ::rtl::Reference< RefCountedMutex > & reMutex,
const ColumnMetaDataVector &vec,
int colCount );
diff --git a/connectivity/source/drivers/postgresql/pq_statics.cxx b/connectivity/source/drivers/postgresql/pq_statics.cxx
index 3920be3b3934..ea9ca0152d85 100644
--- a/connectivity/source/drivers/postgresql/pq_statics.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statics.cxx
@@ -64,8 +64,6 @@ struct DefColumnMetaData
bool isCurrency;
bool isNullable;
bool isAutoIncrement;
- bool isReadOnly;
- bool isSigned;
};
struct BaseTypeDef { const char * typeName; sal_Int32 value; };
@@ -681,25 +679,25 @@ Statics & getStatics()
// that is what is returned by getTypeInfo().getMetaData()
DefColumnMetaData defTypeInfoMetaData[] =
{
- { "TYPE_NAME", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false,false, false }, // 0
- { "DATA_TYPE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false,false, true }, // 1
- { "PRECISION", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false,false, true }, // 2
- { "LITERAL_PREFIX", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false,false, false }, // 3
- { "LITERAL_SUFFIX", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false,false, false }, // 4
- { "CREATE_PARAMS", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false,false, false }, // 5
- { "NULLABLE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false,false, true }, // 6
- { "CASE_SENSITIVE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BOOLEAN, 0,50,false,false,false,false, false }, // 7
- { "SEARCHABLE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false,false, true }, // 8
- { "UNSIGNED_ATTRIBUTE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BOOLEAN, 0,50,false,false,false,false, false }, // 9
- { "FIXED_PREC_SCALE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BOOLEAN, 0,50,false,false,false,false, false }, // 10
- { "AUTO_INCREMENT", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BOOLEAN, 0,50,false,false,false,false, false }, // 11
- { "LOCAL_TYPE_NAME", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false,false, false }, // 12
- { "MINIMUM_SCALE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false,false, true}, // 13
- { "MAXIMUM_SCALE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false,false, true }, // 14
- { "SQL_DATA_TYPE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false,false, true }, // 15
- { "SQL_DATETIME_SUB", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false,false , true}, // 16
- { "NUM_PREC_RADIX", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false,false, true }, // 17
- {nullptr,nullptr,nullptr,nullptr,0,0,0,false,false,false,false, false}
+ { "TYPE_NAME", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false }, // 0
+ { "DATA_TYPE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false }, // 1
+ { "PRECISION", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false }, // 2
+ { "LITERAL_PREFIX", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false }, // 3
+ { "LITERAL_SUFFIX", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false }, // 4
+ { "CREATE_PARAMS", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false }, // 5
+ { "NULLABLE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false }, // 6
+ { "CASE_SENSITIVE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BOOLEAN, 0,50,false,false,false }, // 7
+ { "SEARCHABLE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false }, // 8
+ { "UNSIGNED_ATTRIBUTE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BOOLEAN, 0,50,false,false,false }, // 9
+ { "FIXED_PREC_SCALE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BOOLEAN, 0,50,false,false,false }, // 10
+ { "AUTO_INCREMENT", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BOOLEAN, 0,50,false,false,false }, // 11
+ { "LOCAL_TYPE_NAME", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false }, // 12
+ { "MINIMUM_SCALE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false}, // 13
+ { "MAXIMUM_SCALE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false }, // 14
+ { "SQL_DATA_TYPE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false }, // 15
+ { "SQL_DATETIME_SUB", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false}, // 16
+ { "NUM_PREC_RADIX", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false }, // 17
+ {nullptr,nullptr,nullptr,nullptr,0,0,0,false,false,false}
};
for( i = 0 ; defTypeInfoMetaData[i].columnName ; i++ )
diff --git a/connectivity/source/drivers/postgresql/pq_xindex.hxx b/connectivity/source/drivers/postgresql/pq_xindex.hxx
index 263f5b0057b1..23e9cc1c432b 100644
--- a/connectivity/source/drivers/postgresql/pq_xindex.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xindex.hxx
@@ -53,7 +53,6 @@ namespace pq_sdbc_driver
class Index : public ReflectionBase,
public com::sun::star::sdbcx::XColumnsSupplier
{
- ::com::sun::star::uno::Reference< com::sun::star::sdbc::XDatabaseMetaData > m_meta;
::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_indexColumns;
OUString m_schemaName;
diff --git a/connectivity/source/drivers/postgresql/pq_xkey.hxx b/connectivity/source/drivers/postgresql/pq_xkey.hxx
index 4fa99a44a985..76fda2a68f16 100644
--- a/connectivity/source/drivers/postgresql/pq_xkey.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xkey.hxx
@@ -53,7 +53,6 @@ namespace pq_sdbc_driver
class Key : public ReflectionBase,
public com::sun::star::sdbcx::XColumnsSupplier
{
- ::com::sun::star::uno::Reference< com::sun::star::sdbc::XDatabaseMetaData > m_meta;
::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_keyColumns;
OUString m_schemaName;
diff --git a/connectivity/source/drivers/postgresql/pq_xtable.hxx b/connectivity/source/drivers/postgresql/pq_xtable.hxx
index dc5368b48b7e..4f083e8b9fc8 100644
--- a/connectivity/source/drivers/postgresql/pq_xtable.hxx
+++ b/connectivity/source/drivers/postgresql/pq_xtable.hxx
@@ -63,7 +63,6 @@ class Table : public ReflectionBase,
public com::sun::star::sdbcx::XRename,
public com::sun::star::sdbcx::XAlterTable
{
- ::com::sun::star::uno::Reference< com::sun::star::sdbc::XDatabaseMetaData > m_meta;
::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_columns;
::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > m_keys;
::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_indexes;
diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx
index ec4466e2ea3f..49dad8774e85 100644
--- a/connectivity/source/inc/RowFunctionParser.hxx
+++ b/connectivity/source/inc/RowFunctionParser.hxx
@@ -29,11 +29,6 @@
namespace connectivity
{
-struct OOO_DLLPUBLIC_DBTOOLS RowEquation
-{
- ORowSetValueDecoratorRef nPara[ 3 ];
-};
-
enum ExpressionFunct
{
FUNC_CONST,
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index 6e202cd9cacd..0eaeedd03359 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -104,7 +104,6 @@ namespace connectivity
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStatement;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xDBMetaData;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColNames; // table columns
::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> m_xColsIdx; // table columns
diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx
index 766b0cd42883..a4f2d659f628 100644
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
@@ -94,9 +94,6 @@ namespace connectivity
// Attributes from a result row
class OOO_DLLPUBLIC_FILE OOperandAttr : public OOperandRow
{
- protected:
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xColumn;
-
public:
OOperandAttr(sal_uInt16 _nPos,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn);
diff --git a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
index 4ff4f18ed0f0..dac2a12a0279 100644
--- a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
+++ b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
@@ -34,7 +34,6 @@ namespace connectivity
public java_lang_Object
{
protected:
- java::sql::ConnectionLog m_aLogger;
java_sql_Connection* m_pConnection;
sal_Int32 m_nColumnCount;
@@ -45,7 +44,7 @@ namespace connectivity
virtual jclass getMyClass() const override;
// A ctor that is needed for returning the object
- java_sql_ResultSetMetaData( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rResultSetLogger, java_sql_Connection& _rCon );
+ java_sql_ResultSetMetaData( JNIEnv * pEnv, jobject myObj, java_sql_Connection& _rCon );
virtual sal_Int32 SAL_CALL getColumnCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx
index 36b06618de87..73b90f0b70a2 100644
--- a/connectivity/source/inc/odbc/OBoundParam.hxx
+++ b/connectivity/source/inc/odbc/OBoundParam.hxx
@@ -35,8 +35,6 @@ namespace connectivity
: binaryData(nullptr)
, paramLength(0)
, paramInputStreamLen(0)
- , sqlType(::com::sun::star::sdbc::DataType::SQLNULL)
- , outputParameter(false)
{
}
~OBoundParam()
@@ -125,12 +123,7 @@ namespace connectivity
// until not needed anymore.
sal_Int32 paramInputStreamLen; // Length of input stream
-
- sal_Int32 sqlType; // Java SQL type used to
- // register an OUT parameter
-
- bool outputParameter; // true for OUTPUT parameters
- };
+ };
}
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_OBOUNDPARAM_HXX
diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx
index e8e2bf0d7a7d..a3122f5612c9 100644
--- a/connectivity/source/inc/odbc/OConnection.hxx
+++ b/connectivity/source/inc/odbc/OConnection.hxx
@@ -56,13 +56,8 @@ namespace connectivity
// Data attributes
::std::map< SQLHANDLE,OConnection*> m_aConnections; // holds all connectionas which are need for serveral statements
- TTypeInfoVector m_aTypeInfo; // vector containing an entry
- // for each row returned by
- // DatabaseMetaData.getTypeInfo.
- ::com::sun::star::sdbc::SQLWarning m_aLastWarning; // Last SQLWarning generated by
- // an operation
OUString m_sUser; // the user name
ODBCDriver* m_pDriver; // Pointer to the owning
// driver object
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index 94e5272faf64..3eb9dda656bc 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
@@ -64,9 +64,7 @@ namespace connectivity
::connectivity::TIntVector m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time
::std::map<sal_Int32, ::connectivity::TInt2IntMap > m_aValueRange;
- ::std::map<sal_Int32, ::connectivity::TString2IntMap > m_aStrValueRange;
- ::std::map<sal_Int32, ::connectivity::TInt2StringMap > m_aIntValueRange;
::std::map<sal_Int32,SWORD> m_aODBCColumnTypes;
SQLHANDLE m_aStatementHandle; // ... until freed
diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx
index edd9b320cd88..41845c3086f9 100644
--- a/connectivity/source/inc/odbc/OPreparedStatement.hxx
+++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx
@@ -47,19 +47,6 @@ namespace connectivity
{
protected:
static const short invalid_scale = -1;
- 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
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx
index 5ea18fcc4b87..9811fa5402e1 100644
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
@@ -144,7 +144,6 @@ namespace connectivity
SQLRETURN m_nCurrentFetchState;
bool m_bWasNull;
bool m_bEOF; // after last record
- bool m_bLastRecord;
bool m_bFreeHandle;
bool m_bInserting;
bool m_bRowInserted;
diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx
index b4d5bce6d62e..73ada50f3d10 100644
--- a/connectivity/source/inc/odbc/OStatement.hxx
+++ b/connectivity/source/inc/odbc/OStatement.hxx
@@ -74,7 +74,6 @@ namespace connectivity
OConnection* m_pConnection;// The owning Connection object
SQLHANDLE m_aStatementHandle;
SQLUSMALLINT* m_pRowStatusArray;
- ::cppu::OBroadcastHelper& rBHelper;
protected: