[Libreoffice-commits] core.git: connectivity/source

[Stephan Bergmann]

 connectivity/source/drivers/ado/ACallableStatement.cxx |    4 ++--
 connectivity/source/drivers/ado/AConnection.cxx        |    4 ++--
 connectivity/source/drivers/ado/APreparedStatement.cxx |    3 +--
 connectivity/source/inc/ado/ACallableStatement.hxx     |    2 +-
 connectivity/source/inc/ado/APreparedStatement.hxx     |    3 +--
 5 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit f70ae430a047f44ed16868aa8a802c5f65404cf5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 22 17:40:18 2016 +0100

    OPreparedStatement::m_aTypeInfo is unused
    
    Change-Id: I89a43b06a9983e2fac374298db2fef17f3671ab5

diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx
index 2d6906d..9694948 100644
--- a/connectivity/source/drivers/ado/ACallableStatement.cxx
+++ b/connectivity/source/drivers/ado/ACallableStatement.cxx
@@ -38,8 +38,8 @@ IMPLEMENT_SERVICE_INFO(OCallableStatement,"com.sun.star.sdbcx.ACallableStatement
 
 //************ Class: java.sql.CallableStatement
 
-OCallableStatement::OCallableStatement( OConnection* _pConnection,const OTypeInfoMap& TypeInfo,const OUString& sql )
-                : OPreparedStatement( _pConnection, TypeInfo, sql )
+OCallableStatement::OCallableStatement( OConnection* _pConnection, const OUString& sql )
+                : OPreparedStatement( _pConnection, sql )
 {
     m_Command.put_CommandType(adCmdStoredProc);
 }
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index 47f011a..a61e12d 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -178,7 +178,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OU
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
 
 
-    OPreparedStatement* pStmt = new OPreparedStatement(this,m_aTypeInfo,sql);
+    OPreparedStatement* pStmt = new OPreparedStatement(this, sql);
     Reference< XPreparedStatement > xPStmt = pStmt;
     m_aStatements.push_back(WeakReferenceHelper(*pStmt));
     return xPStmt;
@@ -190,7 +190,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUStrin
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
 
 
-    OCallableStatement* pStmt = new OCallableStatement(this,m_aTypeInfo,sql);
+    OCallableStatement* pStmt = new OCallableStatement(this, sql);
     Reference< XPreparedStatement > xPStmt = pStmt;
     m_aStatements.push_back(WeakReferenceHelper(*pStmt));
     return xPStmt;
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 256fa3f..a29e00d 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -52,9 +52,8 @@ using namespace com::sun::star::util;
 
 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 )
-    ,m_aTypeInfo(TypeInfo)
 {
     osl_atomic_increment( &m_refCount );
 
diff --git a/connectivity/source/inc/ado/ACallableStatement.hxx b/connectivity/source/inc/ado/ACallableStatement.hxx
index ed35e96..726bf69 100644
--- a/connectivity/source/inc/ado/ACallableStatement.hxx
+++ b/connectivity/source/inc/ado/ACallableStatement.hxx
@@ -42,7 +42,7 @@ namespace connectivity
             DECLARE_SERVICE_INFO();
             virtual ~OCallableStatement() override {} ;
             // 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 void SAL_CALL acquire() throw() override;
diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx b/connectivity/source/inc/ado/APreparedStatement.hxx
index 971faa6..73fce94 100644
--- a/connectivity/source/inc/ado/APreparedStatement.hxx
+++ b/connectivity/source/inc/ado/APreparedStatement.hxx
@@ -53,7 +53,6 @@ namespace connectivity
             // Data attributes
 
             css::uno::Reference< css::sdbc::XResultSetMetaData >  m_xMetaData;
-            const OTypeInfoMap& m_aTypeInfo;
             ADOParameters*      m_pParameters;
 
             virtual ~OPreparedStatement() override;
@@ -61,7 +60,7 @@ namespace connectivity
         public:
             DECLARE_SERVICE_INFO();
             // 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 release() throw() override;