diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2021-05-14 14:06:04 +0200 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2021-05-14 16:16:38 +0200 |
commit | 23b39541ddab1bcbeeea9cb6ecb7b5f18d4220a3 (patch) | |
tree | a078bb0cf072f1e12fa5fed7daea7a3e4bb341a3 /connectivity | |
parent | b6d6a3f34163eba45691387dfe2748f7a1788f6a (diff) |
Directly initialize ODatabaseMetaDataResultSet in CDatabaseMetaData.cxx
Change-Id: I32af6d9c699689b688d996c56fd5f64c5ed2f71d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115608
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'connectivity')
-rw-r--r-- | connectivity/source/drivers/calc/CDatabaseMetaData.cxx | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx index bbed24e0c5e2..04945e71de6c 100644 --- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx +++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx @@ -175,12 +175,11 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables( OUString aName = aSheetNames[nSheet]; if ( !lcl_IsEmptyOrHidden( xSheets, aName ) && match(tableNamePattern,aName,'\0') ) { - ODatabaseMetaDataResultSet::ORow aRow { nullptr, nullptr, nullptr }; - aRow.reserve(6); - aRow.push_back(new ORowSetValueDecorator(aName)); - aRow.push_back(new ORowSetValueDecorator(aTable)); - aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue()); - aRows.push_back(aRow); + aRows.push_back( { nullptr, nullptr, nullptr, + new ORowSetValueDecorator(aName), + new ORowSetValueDecorator(aTable), + ODatabaseMetaDataResultSet::getEmptyValue() + } ); } } @@ -200,12 +199,11 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables( OUString aName = aDBNames[nRange]; if ( !lcl_IsUnnamed( xRanges, aName ) && match(tableNamePattern,aName,'\0') ) { - ODatabaseMetaDataResultSet::ORow aRow { nullptr, nullptr, nullptr }; - aRow.reserve(6); - aRow.push_back(new ORowSetValueDecorator(aName)); - aRow.push_back(new ORowSetValueDecorator(aTable)); - aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue()); - aRows.push_back(aRow); + aRows.push_back( { nullptr, nullptr, nullptr, + new ORowSetValueDecorator(aName), + new ORowSetValueDecorator(aTable), + ODatabaseMetaDataResultSet::getEmptyValue() + } ); } } } |