connectivity/source/drivers/ado/AStatement.cxx | 4 ++-- connectivity/source/drivers/macab/MacabStatement.hxx | 4 ++-- connectivity/source/drivers/odbc/OPreparedStatement.cxx | 2 +- connectivity/source/drivers/odbc/OStatement.cxx | 4 ++-- connectivity/source/inc/ado/AStatement.hxx | 4 ++-- connectivity/source/inc/odbc/OStatement.hxx | 4 ++-- mysqlc/source/mysqlc_statement.cxx | 2 +- mysqlc/source/mysqlc_statement.hxx | 4 ++-- odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx | 2 +- odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx | 4 ++-- 10 files changed, 17 insertions(+), 17 deletions(-)
New commits: commit 70d9ae239bb4f5fbde135a7fe13d0a99c60d5172 Author: Julien Nabet <[email protected]> Date: Thu Aug 31 20:32:58 2017 +0200 Use vector and replace m_aBatchList by m_aBatchVector Change-Id: I7c2c529eb78679f9733374bf0785773684c728c4 Reviewed-on: https://gerrit.libreoffice.org/41770 Tested-by: Jenkins <[email protected]> Reviewed-by: Julien Nabet <[email protected]> diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index c7348fde31fd..727902407b0f 100644 --- a/connectivity/source/drivers/ado/AStatement.cxx +++ b/connectivity/source/drivers/ado/AStatement.cxx @@ -339,7 +339,7 @@ void SAL_CALL OStatement::addBatch( const OUString& sql ) checkDisposed(OStatement_BASE::rBHelper.bDisposed); - m_aBatchList.push_back(sql); + m_aBatchVector.push_back(sql); } Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) @@ -352,7 +352,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) OUString aBatchSql; sal_Int32 nLen = 0; - for(std::list< OUString>::const_iterator i=m_aBatchList.begin();i != m_aBatchList.end();++i,++nLen) + for(std::vector< OUString>::const_iterator i=m_aBatchVector.begin();i != m_aBatchVector.end();++i,++nLen) aBatchSql = aBatchSql + *i + ";"; diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx index 1319ca72c0ea..4beb8765c2d4 100644 --- a/connectivity/source/drivers/macab/MacabStatement.hxx +++ b/connectivity/source/drivers/macab/MacabStatement.hxx @@ -22,7 +22,7 @@ #include "MacabConnection.hxx" #include "MacabHeader.hxx" -#include <list> +#include <vector> #include <connectivity/sqliterator.hxx> #include <connectivity/sqlparse.hxx> #include <com/sun/star/sdbc/XStatement.hpp> @@ -54,7 +54,7 @@ namespace connectivity css::sdbc::SQLWarning m_aLastWarning; protected: - std::list< OUString> m_aBatchList; + std::vector< OUString> m_aBatchVector; connectivity::OSQLParser m_aParser; connectivity::OSQLParseTreeIterator m_aSQLIterator; connectivity::OSQLParseNode* m_pParseTree; diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx index b5e9ed498f52..0bc55f8eb247 100644 --- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx +++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx @@ -671,7 +671,7 @@ void SAL_CALL OPreparedStatement::clearBatch( ) { ::dbtools::throwFunctionNotSupportedSQLException( "XPreparedBatchExecution::clearBatch", *this ); // clearParameters( ); - // m_aBatchList.erase(); + // m_aBatchVector.erase(); } diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index 795aad1c51b0..afa32c37bd4e 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -474,7 +474,7 @@ void SAL_CALL OStatement::addBatch( const OUString& sql ) checkDisposed(OStatement_BASE::rBHelper.bDisposed); - m_aBatchList.push_back(sql); + m_aBatchVector.push_back(sql); } Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) @@ -485,7 +485,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) OString aBatchSql; sal_Int32 nLen = 0; - for(std::list< OUString>::const_iterator i=m_aBatchList.begin();i != m_aBatchList.end();++i,++nLen) + for(std::vector< OUString>::const_iterator i=m_aBatchVector.begin();i != m_aBatchVector.end();++i,++nLen) { aBatchSql += OUStringToOString(*i,getOwnConnection()->getTextEncoding()); aBatchSql += ";"; diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx index bf16e48dff04..495578694ea4 100644 --- a/connectivity/source/inc/ado/AStatement.hxx +++ b/connectivity/source/inc/ado/AStatement.hxx @@ -32,7 +32,7 @@ #include <comphelper/proparrhlp.hxx> #include <comphelper/uno3.hxx> #include "ado/AConnection.hxx" -#include <list> +#include <vector> #include "ado/Awrapado.hxx" #include <com/sun/star/lang/XServiceInfo.hpp> @@ -62,7 +62,7 @@ namespace connectivity css::sdbc::SQLWarning m_aLastWarning; protected: - std::list< OUString> m_aBatchList; + std::vector< OUString> m_aBatchVector; css::uno::WeakReference< css::sdbc::XResultSet> m_xResultSet; // The last ResultSet created // for this Statement diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index 64e22afa3721..44aa88d99a4c 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -36,7 +36,7 @@ #include "odbc/OFunctions.hxx" #include "odbc/OConnection.hxx" #include "odbc/odbcbasedllapi.hxx" -#include <list> +#include <vector> #include <com/sun/star/lang/XServiceInfo.hpp> namespace connectivity @@ -68,7 +68,7 @@ namespace connectivity css::uno::Reference< css::sdbc::XStatement> m_xGeneratedStatement; // for this Statement - std::list< OUString> m_aBatchList; + std::vector< OUString> m_aBatchVector; OUString m_sSqlStatement; rtl::Reference<OConnection> m_pConnection;// The owning Connection object diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx index 94e340cb07c9..20d90e28024b 100644 --- a/mysqlc/source/mysqlc_statement.cxx +++ b/mysqlc/source/mysqlc_statement.cxx @@ -192,7 +192,7 @@ void SAL_CALL OStatement::addBatch(const rtl::OUString& sql) MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); - m_aBatchList.push_back(sql); + m_aBatchVector.push_back(sql); } Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch() diff --git a/mysqlc/source/mysqlc_statement.hxx b/mysqlc/source/mysqlc_statement.hxx index 02533fabe8ea..b7357d27ecb7 100644 --- a/mysqlc/source/mysqlc_statement.hxx +++ b/mysqlc/source/mysqlc_statement.hxx @@ -34,7 +34,7 @@ #include <cppconn/statement.h> #include <cppuhelper/compbase5.hxx> -#include <list> +#include <vector> namespace connectivity { @@ -71,7 +71,7 @@ namespace connectivity SQLWarning m_aLastWarning; protected: - ::std::list< rtl::OUString> m_aBatchList; + ::std::vector< rtl::OUString> m_aBatchVector; OConnection* m_pConnection; // The owning Connection object diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx index a5c67c6c8ced..e36776469d2a 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx @@ -195,7 +195,7 @@ void SAL_CALL OStatement::addBatch( const ::rtl::OUString& sql ) throw(SQLExcept checkDisposed(OStatement_BASE::rBHelper.bDisposed); - m_aBatchList.push_back(sql); + m_aBatchVector.push_back(sql); } Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException, RuntimeException) diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx index 66393c2d6ce1..c870048d8146 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx @@ -45,7 +45,7 @@ #include <com/sun/star/util/XCancellable.hpp> #include <cppuhelper/compbase5.hxx> #include "SConnection.hxx" -#include <list> +#include <vector> #include "OSubComponent.hxx" #include <com/sun/star/lang/XServiceInfo.hpp> @@ -72,7 +72,7 @@ namespace connectivity ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XResultSet> m_xResultSet; // The last ResultSet created // for this Statement - ::std::list< ::rtl::OUString> m_aBatchList; + ::std::vector< ::rtl::OUString> m_aBatchVector; OConnection* m_pConnection; // The owning Connection object protected: _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
