Directly initialize vector in connectivity (part 1)

Change-Id: I3b0bf1ca710aba58d7d649687b5d791374be8d6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115610
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>

3 files changed, 52 insertions, 51 deletions

diff --git a/connectivity/source/drivers/component/CDatabaseMetaData.cxx b/connectivity/source/drivers/component/CDatabaseMetaData.cxx
index ea5ca9f31879..cb5d1dcab4eb 100644
--- a/connectivity/source/drivers/component/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/component/CDatabaseMetaData.cxx
@@ -53,31 +53,29 @@ Reference< XResultSet > OComponentDatabaseMetaData::impl_getTypeInfo_throw(  )
     static ODatabaseMetaDataResultSet::ORows aRows;
     if(aRows.empty())
     {
-        ODatabaseMetaDataResultSet::ORow aRow;
-
         aRows.reserve(6);
-        aRow.reserve(18);
-
-        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(new ORowSetValueDecorator(OUString("VARCHAR")));
-        aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR));
-        aRow.push_back(new ORowSetValueDecorator(sal_Int32(65535)));
-        aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
-        aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
-        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(ODatabaseMetaDataResultSet::get1Value()); // ORowSetValue((sal_Int32)ColumnValue::NULLABLE)
-        aRow.push_back(ODatabaseMetaDataResultSet::get1Value());
-        aRow.push_back(new ORowSetValueDecorator(sal_Int32(ColumnSearch::CHAR)));
-        aRow.push_back(ODatabaseMetaDataResultSet::get1Value());
-        aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
-        aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
-        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
-        aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
-        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(new ORowSetValueDecorator(sal_Int32(10)));
-
+        ODatabaseMetaDataResultSet::ORow aRow
+        {
+            ODatabaseMetaDataResultSet::getEmptyValue(),
+            new ORowSetValueDecorator(OUString("VARCHAR")),
+            new ORowSetValueDecorator(DataType::VARCHAR),
+            new ORowSetValueDecorator(sal_Int32(65535)),
+            ODatabaseMetaDataResultSet::getQuoteValue(),
+            ODatabaseMetaDataResultSet::getQuoteValue(),
+            ODatabaseMetaDataResultSet::getEmptyValue(),
+            ODatabaseMetaDataResultSet::get1Value(), // ORowSetValue((sal_Int32)ColumnValue::NULLABLE
+            ODatabaseMetaDataResultSet::get1Value(),
+            new ORowSetValueDecorator(sal_Int32(ColumnSearch::CHAR)),
+            ODatabaseMetaDataResultSet::get1Value(),
+            ODatabaseMetaDataResultSet::get0Value(),
+            ODatabaseMetaDataResultSet::get0Value(),
+            ODatabaseMetaDataResultSet::getEmptyValue(),
+            ODatabaseMetaDataResultSet::get0Value(),
+            ODatabaseMetaDataResultSet::get0Value(),
+            ODatabaseMetaDataResultSet::getEmptyValue(),
+            ODatabaseMetaDataResultSet::getEmptyValue(),
+            new ORowSetValueDecorator(sal_Int32(10))
+        };
 
         aRows.push_back(aRow);
 
diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index cb8113a52652..4bb3a0c7179a 100644
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
@@ -61,28 +61,29 @@ Reference< XResultSet > ODbaseDatabaseMetaData::impl_getTypeInfo_throw(  )
     static ODatabaseMetaDataResultSet::ORows aRows;
     if(aRows.empty())
     {
-        ODatabaseMetaDataResultSet::ORow aRow;
-        aRow.reserve(19);
-
-        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(new ORowSetValueDecorator(OUString("VARCHAR")));
-        aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR));
-        aRow.push_back(new ORowSetValueDecorator(sal_Int32(254)));
-        aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
-        aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
-        aRow.push_back(new ORowSetValueDecorator(OUString("length")));
-        aRow.push_back(new ORowSetValueDecorator(sal_Int32(ColumnValue::NULLABLE)));
-        aRow.push_back(ODatabaseMetaDataResultSet::get1Value());
-        aRow.push_back(new ORowSetValueDecorator(sal_Int32(ColumnSearch::FULL)));
-        aRow.push_back(ODatabaseMetaDataResultSet::get1Value());
-        aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
-        aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
-        aRow.push_back(new ORowSetValueDecorator(OUString("C")));
-        aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
-        aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
-        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(new ORowSetValueDecorator(sal_Int32(10)));
+        aRows.reserve(10);
+        ODatabaseMetaDataResultSet::ORow aRow
+        {
+            ODatabaseMetaDataResultSet::getEmptyValue(),
+            new ORowSetValueDecorator(OUString("VARCHAR")),
+            new ORowSetValueDecorator(DataType::VARCHAR),
+            new ORowSetValueDecorator(sal_Int32(254)),
+            ODatabaseMetaDataResultSet::getQuoteValue(),
+            ODatabaseMetaDataResultSet::getQuoteValue(),
+            new ORowSetValueDecorator(OUString("length")),
+            new ORowSetValueDecorator(sal_Int32(ColumnValue::NULLABLE)),
+            ODatabaseMetaDataResultSet::get1Value(),
+            new ORowSetValueDecorator(sal_Int32(ColumnSearch::FULL)),
+            ODatabaseMetaDataResultSet::get1Value(),
+            ODatabaseMetaDataResultSet::get0Value(),
+            ODatabaseMetaDataResultSet::get0Value(),
+            new ORowSetValueDecorator(OUString("C")),
+            ODatabaseMetaDataResultSet::get0Value(),
+            ODatabaseMetaDataResultSet::get0Value(),
+            ODatabaseMetaDataResultSet::getEmptyValue(),
+            ODatabaseMetaDataResultSet::getEmptyValue(),
+            new ORowSetValueDecorator(sal_Int32(10))
+        };
 
         aRows.push_back(aRow);
 
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 57b6bee8c43c..5b1ea452f61a 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -1885,11 +1885,13 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, const OValueRefRow& pOrgRo
                         m_xColumns->getByIndex(i) >>= xCol;
                         OSL_ENSURE(xCol.is(),"ODbaseTable::UpdateBuffer column is null!");
                         xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aColName;
-                        std::vector< std::pair<const char* , OUString > > aStringToSubstitutes;
-                        aStringToSubstitutes.push_back(std::pair<const char* , OUString >("$columnname$", aColName));
-                        aStringToSubstitutes.push_back(std::pair<const char* , OUString >("$precision$", OUString::number(nLen)));
-                        aStringToSubstitutes.push_back(std::pair<const char* , OUString >("$scale$", OUString::number(nScale)));
-                        aStringToSubstitutes.push_back(std::pair<const char* , OUString >("$value$", OStringToOUString(aDefaultValue,RTL_TEXTENCODING_UTF8)));
+                        std::vector< std::pair<const char* , OUString > > aStringToSubstitutes
+                        {
+                            { "$columnname$", aColName },
+                            { "$precision$", OUString::number(nLen) },
+                            { "$scale$", OUString::number(nScale) },
+                            { "$value$", OStringToOUString(aDefaultValue,RTL_TEXTENCODING_UTF8) }
+                        };
 
                         const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
                                 STR_INVALID_COLUMN_DECIMAL_VALUE