Directly initialize vector in connectivity (part 2)

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

3 files changed, 53 insertions, 55 deletions

diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index ead76b086ce5..455bf09e6733 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -988,15 +988,12 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTableTypes(  )
     rtl::Reference<::connectivity::ODatabaseMetaDataResultSet> pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes);
 
     // here we fill the rows which should be visible when ask for data from the resultset returned here
-    ODatabaseMetaDataResultSet::ORows aRows;
-    for(std::size_t i=0;i < SAL_N_ELEMENTS(sTableTypes);++i)
+    auto nNbTypes = SAL_N_ELEMENTS(sTableTypes);
+    ODatabaseMetaDataResultSet::ORows aRows(nNbTypes);
+    for(std::size_t i=0;i < nNbTypes;++i)
     {
-        ODatabaseMetaDataResultSet::ORow aRow;
-        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(new ORowSetValueDecorator(OUString(sTableTypes[i])));
-
         // bound row
-        aRows.push_back(aRow);
+        aRows.push_back( { ODatabaseMetaDataResultSet::getEmptyValue(), new ORowSetValueDecorator(OUString(sTableTypes[i])) });
     }
     // here we set the rows at the resultset
     pResult->setRows(aRows);
@@ -1013,29 +1010,29 @@ Reference< XResultSet > OEvoabDatabaseMetaData::impl_getTypeInfo_throw(  )
 
     static ODatabaseMetaDataResultSet::ORows aRows = []()
     {
-        ODatabaseMetaDataResultSet::ORows tmp;
-        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(s_nCHAR_OCTET_LENGTH)));
-        aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
-        aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
-        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        // aRow.push_back(new ORowSetValueDecorator((sal_Int32)ColumnValue::NULLABLE));
-        aRow.push_back(ODatabaseMetaDataResultSet::get1Value());
-        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(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::ORows tmp(2);
+        ODatabaseMetaDataResultSet::ORow aRow
+        {
+            { ODatabaseMetaDataResultSet::getEmptyValue() },
+            { new ORowSetValueDecorator(OUString("VARCHAR")) },
+            { new ORowSetValueDecorator(DataType::VARCHAR) },
+            { new ORowSetValueDecorator(sal_Int32(s_nCHAR_OCTET_LENGTH)) },
+            { ODatabaseMetaDataResultSet::getQuoteValue() },
+            { ODatabaseMetaDataResultSet::getQuoteValue() },
+            { ODatabaseMetaDataResultSet::getEmptyValue() },
+            { ODatabaseMetaDataResultSet::get1Value() },
+            { ODatabaseMetaDataResultSet::get1Value() },
+            { new ORowSetValueDecorator(sal_Int32(ColumnSearch::FULL)) },
+            { ODatabaseMetaDataResultSet::get1Value() },
+            { ODatabaseMetaDataResultSet::get0Value() },
+            { ODatabaseMetaDataResultSet::get0Value() },
+            { ODatabaseMetaDataResultSet::getEmptyValue() },
+            { ODatabaseMetaDataResultSet::get0Value() },
+            { ODatabaseMetaDataResultSet::get0Value() },
+            { ODatabaseMetaDataResultSet::getEmptyValue() },
+            { ODatabaseMetaDataResultSet::getEmptyValue() },
+            { new ORowSetValueDecorator(sal_Int32(10)) }
+        };
 
         tmp.push_back(aRow);
 
@@ -1190,14 +1187,16 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables(
                 OUString aName = OStringToOUString( e_source_peek_name( pSource ),
                                                               RTL_TEXTENCODING_UTF8 );
 
-                ODatabaseMetaDataResultSet::ORow aRow{
-                    ORowSetValueDecoratorRef(),
-                    ORowSetValueDecoratorRef(),
-                    ORowSetValueDecoratorRef(),
-                    new ORowSetValueDecorator(aName),
-                    new ORowSetValueDecorator(ORowSetValue(aTable)),
-                    ODatabaseMetaDataResultSet::getEmptyValue()};
-                aRows.push_back(aRow);
+                aRows.push_back(
+                                 {
+                                     ORowSetValueDecoratorRef(),
+                                     ORowSetValueDecoratorRef(),
+                                     ORowSetValueDecoratorRef(),
+                                     new ORowSetValueDecorator(aName),
+                                     new ORowSetValueDecorator(ORowSetValue(aTable)),
+                                     ODatabaseMetaDataResultSet::getEmptyValue()
+                                 }
+                               );
             }
         }
     }
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index d6fe54628200..215c381aa8c1 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -616,10 +616,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  )
     static ODatabaseMetaDataResultSet::ORows aRows;
     if(aRows.empty())
     {
-        ODatabaseMetaDataResultSet::ORow aRow;
-        aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(new ORowSetValueDecorator(OUString("TABLE")));
-        aRows.push_back(aRow);
+        aRows.push_back( { ODatabaseMetaDataResultSet::getEmptyValue(), new ORowSetValueDecorator(OUString("TABLE")) } );
     }
     pResult->setRows(aRows);
     return pResult;
diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx
index f5045552cdb0..f536df64039d 100644
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
@@ -97,54 +97,56 @@ Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const OUSt
 {
     if ( acceptsURL(url) )
     {
-        std::vector< DriverPropertyInfo > aDriverInfo;
 
         Sequence< OUString > aBoolean(2);
         aBoolean[0] = "0";
         aBoolean[1] = "1";
 
-        aDriverInfo.push_back(DriverPropertyInfo(
+        std::vector< DriverPropertyInfo > aDriverInfo
+        {
+             { DriverPropertyInfo(
                 "CharSet"
                 ,"CharSet of the database."
                 ,false
                 ,OUString()
                 ,Sequence< OUString >())
-                );
-        aDriverInfo.push_back(DriverPropertyInfo(
+             },
+             { DriverPropertyInfo(
                 "Extension"
                 ,"Extension of the file format."
                 ,false
                 ,".*"
                 ,Sequence< OUString >())
-                );
-        aDriverInfo.push_back(DriverPropertyInfo(
+             },
+             { DriverPropertyInfo(
                 "ShowDeleted"
                 ,"Display inactive records."
                 ,false
                 ,"0"
                 ,aBoolean)
-                );
-        aDriverInfo.push_back(DriverPropertyInfo(
+             },
+             { DriverPropertyInfo(
                 "EnableSQL92Check"
                 ,"Use SQL92 naming constraints."
                 ,false
                 ,"0"
                 ,aBoolean)
-                );
-        aDriverInfo.push_back(DriverPropertyInfo(
+             },
+             { DriverPropertyInfo(
                 "UseRelativePath"
                 ,"Handle the connection url as relative path."
                 ,false
                 ,"0"
                 ,aBoolean)
-                );
-        aDriverInfo.push_back(DriverPropertyInfo(
+             },
+             { DriverPropertyInfo(
                 "URL"
                 ,"The URL of the database document which is used to create an absolute path."
                 ,false
                 ,OUString()
                 ,Sequence< OUString >())
-                );
+             }
+        };
         return Sequence< DriverPropertyInfo >(aDriverInfo.data(),aDriverInfo.size());
     } // if ( acceptsURL(url) )
     {