summaryrefslogtreecommitdiff
path: root/dbaccess/source/filter/hsqldb/hsqlimport.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/filter/hsqldb/hsqlimport.cxx')
-rw-r--r--dbaccess/source/filter/hsqldb/hsqlimport.cxx21
1 files changed, 9 insertions, 12 deletions
diff --git a/dbaccess/source/filter/hsqldb/hsqlimport.cxx b/dbaccess/source/filter/hsqldb/hsqlimport.cxx
index b29889c1b6cd..dc5b51cc07ce 100644
--- a/dbaccess/source/filter/hsqldb/hsqlimport.cxx
+++ b/dbaccess/source/filter/hsqldb/hsqlimport.cxx
@@ -48,12 +48,8 @@ using namespace css::io;
using namespace css::uno;
using namespace css::sdbc;
-using ColumnTypeVector = std::vector<dbahsql::ColumnDefinition>;
-using RowVector = std::vector<Any>;
-using IndexVector = std::vector<sal_Int32>;
-
-void lcl_setParams(const RowVector& row, Reference<XParameters> const& xParam,
- const ColumnTypeVector& rColTypes)
+void lcl_setParams(const std::vector<Any>& row, Reference<XParameters> const& xParam,
+ const std::vector<dbahsql::ColumnDefinition>& rColTypes)
{
assert(row.size() == rColTypes.size());
size_t nColIndex = 0;
@@ -182,7 +178,8 @@ void lcl_setParams(const RowVector& row, Reference<XParameters> const& xParam,
}
}
-OUString lcl_createInsertStatement(const OUString& sTableName, const ColumnTypeVector& rColTypes)
+OUString lcl_createInsertStatement(const OUString& sTableName,
+ const std::vector<dbahsql::ColumnDefinition>& rColTypes)
{
assert(rColTypes.size() > 0);
OUStringBuffer sql("INSERT INTO ");
@@ -221,8 +218,8 @@ HsqlImporter::HsqlImporter(Reference<XConnection>& rConnection, const Reference<
m_xStorage.set(rStorage);
}
-void HsqlImporter::insertRow(const RowVector& xRows, const OUString& sTableName,
- const ColumnTypeVector& rColTypes)
+void HsqlImporter::insertRow(const std::vector<css::uno::Any>& xRows, const OUString& sTableName,
+ const std::vector<ColumnDefinition>& rColTypes)
{
OUString sStatement = lcl_createInsertStatement(sTableName, rColTypes);
Reference<XPreparedStatement> xStatement = m_rConnection->prepareStatement(sStatement);
@@ -236,8 +233,8 @@ void HsqlImporter::insertRow(const RowVector& xRows, const OUString& sTableName,
}
void HsqlImporter::processTree(HsqlBinaryNode& rNode, HsqlRowInputStream& rStream,
- const ColumnTypeVector& rColTypes, const OUString& sTableName,
- sal_Int32 nIndexCount)
+ const std::vector<ColumnDefinition>& rColTypes,
+ const OUString& sTableName, sal_Int32 nIndexCount)
{
rNode.readChildren(rStream);
sal_Int32 nNext = rNode.getLeft();
@@ -267,7 +264,7 @@ void HsqlImporter::processTree(HsqlBinaryNode& rNode, HsqlRowInputStream& rStrea
* Balance: ?
* Left/Right/Parent: File position of the Left/Right/Parent child
*/
-void HsqlImporter::parseTableRows(const IndexVector& rIndexes,
+void HsqlImporter::parseTableRows(const std::vector<sal_Int32>& rIndexes,
const std::vector<ColumnDefinition>& rColTypes,
const OUString& sTableName)
{