[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - connectivity/source

[Julien Nabet (via logerrit)]

 connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cf3672dd1803edd435acbcd6aaaf07e7a0e8c74c
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat Dec 11 15:59:53 2021 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Dec 13 15:19:00 2021 +0100

    Fix regression in connectivity/evoab2
    
    Regression from 46d3e84d7a131f7c72cb536ab2f314cb55ffc155
    Directly initialize vector in connectivity (part 2)
    
    Pinpointed thanks to this log:
    
warn:dbaccess:612118:612118:dbaccess/source/core/dataaccess/connection.cxx:344: 
DBG_UNHANDLED_EXCEPTION in OConnection exception: 
com.sun.star.sdbc.SQLException message: Invalid descriptor index. 
/home/julien/lo/libreoffice/connectivity/source/commontools/dbexception.cxx:365 
SQLState: 07009 ErrorCode: 0
        wrapped: void message: 
/home/julien/lo/libreoffice/tools/source/debug/debug.cxx:104
    when launching Base then connecting to Evolution local.
    
    Change-Id: Id4cb0fc322b0df24ed2b2d89a5595f4841db1845
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126672
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    (cherry picked from commit 80eb86b7e697751d24ca12310e6b6e23a1bb54cf)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126682

diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx 
b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 6c798e5a166c..3f6e00aa43bb 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -989,7 +989,7 @@ Reference< XResultSet > SAL_CALL 
OEvoabDatabaseMetaData::getTableTypes(  )
 
     // here we fill the rows which should be visible when ask for data from 
the resultset returned here
     auto nNbTypes = SAL_N_ELEMENTS(sTableTypes);
-    ODatabaseMetaDataResultSet::ORows aRows(nNbTypes);
+    ODatabaseMetaDataResultSet::ORows aRows;
     for(std::size_t i=0;i < nNbTypes;++i)
     {
         // bound row
@@ -1010,7 +1010,7 @@ Reference< XResultSet > 
OEvoabDatabaseMetaData::impl_getTypeInfo_throw(  )
 
     static ODatabaseMetaDataResultSet::ORows aRows = []()
     {
-        ODatabaseMetaDataResultSet::ORows tmp(2);
+        ODatabaseMetaDataResultSet::ORows tmp;
         ODatabaseMetaDataResultSet::ORow aRow
         {
              ODatabaseMetaDataResultSet::getEmptyValue() ,