diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2021-10-15 16:31:45 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2021-10-15 18:11:59 +0200 |
| commit | b695169194c671464f0fab2bc6eb9af94ca68710 (patch) | |
| tree | 4317a67d011ed6a5537fd301709399809d592761 /connectivity | |
| parent | 9615451c0bf19f0b5b46aa421a5052e1b5defedb (diff) | |
Simplify vector initialization in connectivity
Change-Id: I4eb3ca5b1a45e585f076c7e11f616be4614d972a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123662
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx | 42 |
1 files changed, 14 insertions, 28 deletions
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx index 77e20700b135..13afe4fbbb5e 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx @@ -565,9 +565,8 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getTableTypes() { if (m_rConnection.getMysqlVersion() >= requiredVersion[i]) { - std::vector<Any> aRow{ Any() }; - aRow.push_back(makeAny(mysqlc_sdbc_driver::convert(table_types[i], encoding))); - rRows.push_back(aRow); + rRows.push_back( + { { Any(), makeAny(mysqlc_sdbc_driver::convert(table_types[i], encoding)) } }); } } lcl_setRows_throw(xResultSet, 5, rRows); @@ -586,32 +585,19 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getTypeInfo() unsigned int i = 0; while (mysqlc_types[i].typeName) { - std::vector<Any> aRow{ Any() }; - - aRow.push_back(makeAny(mysqlc_sdbc_driver::convert(mysqlc_types[i].typeName, encoding))); - aRow.push_back(makeAny(mysqlc_types[i].dataType)); - aRow.push_back(makeAny(mysqlc_types[i].precision)); - aRow.push_back( - makeAny(mysqlc_sdbc_driver::convert(mysqlc_types[i].literalPrefix, encoding))); - aRow.push_back( - makeAny(mysqlc_sdbc_driver::convert(mysqlc_types[i].literalSuffix, encoding))); - aRow.push_back( - makeAny(mysqlc_sdbc_driver::convert(mysqlc_types[i].createParams, encoding))); - aRow.push_back(makeAny(mysqlc_types[i].nullable)); - aRow.push_back(makeAny(mysqlc_types[i].caseSensitive)); - aRow.push_back(makeAny(mysqlc_types[i].searchable)); - aRow.push_back(makeAny(mysqlc_types[i].isUnsigned)); - aRow.push_back(makeAny(mysqlc_types[i].fixedPrecScale)); - aRow.push_back(makeAny(mysqlc_types[i].autoIncrement)); - aRow.push_back( - makeAny(mysqlc_sdbc_driver::convert(mysqlc_types[i].localTypeName, encoding))); - aRow.push_back(makeAny(mysqlc_types[i].minScale)); - aRow.push_back(makeAny(mysqlc_types[i].maxScale)); - aRow.push_back(makeAny(sal_Int32(0))); - aRow.push_back(makeAny(sal_Int32(0))); - aRow.push_back(makeAny(sal_Int32(10))); + rRows.push_back( + { { Any(), makeAny(mysqlc_sdbc_driver::convert(mysqlc_types[i].typeName, encoding)), + makeAny(mysqlc_types[i].dataType), makeAny(mysqlc_types[i].precision), + makeAny(mysqlc_sdbc_driver::convert(mysqlc_types[i].literalPrefix, encoding)), + makeAny(mysqlc_sdbc_driver::convert(mysqlc_types[i].literalSuffix, encoding)), + makeAny(mysqlc_sdbc_driver::convert(mysqlc_types[i].createParams, encoding)), + makeAny(mysqlc_types[i].nullable), makeAny(mysqlc_types[i].caseSensitive), + makeAny(mysqlc_types[i].searchable), makeAny(mysqlc_types[i].isUnsigned), + makeAny(mysqlc_types[i].fixedPrecScale), makeAny(mysqlc_types[i].autoIncrement), + makeAny(mysqlc_sdbc_driver::convert(mysqlc_types[i].localTypeName, encoding)), + makeAny(mysqlc_types[i].minScale), makeAny(mysqlc_types[i].maxScale), + makeAny(sal_Int32(0)), makeAny(sal_Int32(0)), makeAny(sal_Int32(10)) } }); - rRows.push_back(aRow); i++; } |