mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OPreparedStatement::m_aTypeInfo is unused

Browse Source 
Change-Id: I89a43b06a9983e2fac374298db2fef17f3671ab5
This commit is contained in:
Stephan Bergmann
2016-11-22 17:40:18 +01:00
parent e19ffa1359
commit f70ae430a0
5 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
connectivity/source/drivers/ado/ACallableStatement.cxx
View File

@@ -38,8 +38,8 @@ IMPLEMENT_SERVICE_INFO(OCallableStatement,"com.sun.star.sdbcx.ACallableStatement
//************ Class: java.sql.CallableStatement //************ Class: java.sql.CallableStatement
OCallableStatement::OCallableStatement( OConnection* _pConnection,const OTypeInfoMap& TypeInfo,const OUString& sql ) OCallableStatement::OCallableStatement( OConnection* _pConnection, const OUString& sql )
: OPreparedStatement( _pConnection, TypeInfo, sql ) : OPreparedStatement( _pConnection, sql )
{ {
m_Command.put_CommandType(adCmdStoredProc); m_Command.put_CommandType(adCmdStoredProc);
} }

4
connectivity/source/drivers/ado/AConnection.cxx
View File

@@ -178,7 +178,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OU
checkDisposed(OConnection_BASE::rBHelper.bDisposed); checkDisposed(OConnection_BASE::rBHelper.bDisposed);
OPreparedStatement* pStmt = new OPreparedStatement(this,m_aTypeInfo,sql); OPreparedStatement* pStmt = new OPreparedStatement(this, sql);
Reference< XPreparedStatement > xPStmt = pStmt; Reference< XPreparedStatement > xPStmt = pStmt;
m_aStatements.push_back(WeakReferenceHelper(*pStmt)); m_aStatements.push_back(WeakReferenceHelper(*pStmt));
return xPStmt; return xPStmt;
@@ -190,7 +190,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUStrin
checkDisposed(OConnection_BASE::rBHelper.bDisposed); checkDisposed(OConnection_BASE::rBHelper.bDisposed);
OCallableStatement* pStmt = new OCallableStatement(this,m_aTypeInfo,sql); OCallableStatement* pStmt = new OCallableStatement(this, sql);
Reference< XPreparedStatement > xPStmt = pStmt; Reference< XPreparedStatement > xPStmt = pStmt;
m_aStatements.push_back(WeakReferenceHelper(*pStmt)); m_aStatements.push_back(WeakReferenceHelper(*pStmt));
return xPStmt; return xPStmt;

3
connectivity/source/drivers/ado/APreparedStatement.cxx
View File

@@ -52,9 +52,8 @@ using namespace com::sun::star::util;
IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.APreparedStatement","com.sun.star.sdbc.PreparedStatement"); IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.APreparedStatement","com.sun.star.sdbc.PreparedStatement");
OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OTypeInfoMap& TypeInfo,const OUString& sql) OPreparedStatement::OPreparedStatement( OConnection* _pConnection, const OUString& sql)
: OStatement_Base( _pConnection ) : OStatement_Base( _pConnection )
,m_aTypeInfo(TypeInfo)
{ {
osl_atomic_increment( &m_refCount ); osl_atomic_increment( &m_refCount );

2
connectivity/source/inc/ado/ACallableStatement.hxx
View File

@@ -42,7 +42,7 @@ namespace connectivity
DECLARE_SERVICE_INFO(); DECLARE_SERVICE_INFO();
virtual ~OCallableStatement() override {} ; virtual ~OCallableStatement() override {} ;
// a Constructor, that is needed for when Returning the Object is needed: // a Constructor, that is needed for when Returning the Object is needed:
OCallableStatement( OConnection* _pConnection,const OTypeInfoMap& TypeInfo,const OUString& sql ); OCallableStatement( OConnection* _pConnection, const OUString& sql );
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException) override; virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException) override;
virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL acquire() throw() override;

3
connectivity/source/inc/ado/APreparedStatement.hxx
View File

@@ -53,7 +53,6 @@ namespace connectivity
// Data attributes // Data attributes
css::uno::Reference< css::sdbc::XResultSetMetaData > m_xMetaData; css::uno::Reference< css::sdbc::XResultSetMetaData > m_xMetaData;
const OTypeInfoMap& m_aTypeInfo;
ADOParameters* m_pParameters; ADOParameters* m_pParameters;
virtual ~OPreparedStatement() override; virtual ~OPreparedStatement() override;
@@ -61,7 +60,7 @@ namespace connectivity
public: public:
DECLARE_SERVICE_INFO(); DECLARE_SERVICE_INFO();
// a Constructor, that is needed for when Returning the Object is needed: // a Constructor, that is needed for when Returning the Object is needed:
OPreparedStatement( OConnection* _pConnection,const OTypeInfoMap& TypeInfo,const OUString& sql); OPreparedStatement( OConnection* _pConnection, const OUString& sql);
virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL acquire() throw() override;
virtual void SAL_CALL release() throw() override; virtual void SAL_CALL release() throw() override;