[Libreoffice-commits] core.git: connectivity/source

[Julien Nabet (via logerrit)]

 connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx |   24 ++++++---------
 connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx |    2 -
 2 files changed, 10 insertions(+), 16 deletions(-)

New commits:
commit ccb4ec50aac95bceedea762345203023b5ba57f3
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sun Dec 19 10:16:35 2021 +0100
Commit:     Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Dec 19 11:47:09 2021 +0100

    Merge getColumnRows in getColumns (evoab2/OEvoabDatabaseMetaData)
    
    Change-Id: Ia8177290b604413d9b4d5c0d703719b502277492
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127093
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
    Tested-by: Jenkins

diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx 
b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 6469f5d6a5bf..b3a10c016bce 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -253,8 +253,14 @@ OEvoabDatabaseMetaData::~OEvoabDatabaseMetaData()
 }
 
 
-ODatabaseMetaDataResultSet::ORows OEvoabDatabaseMetaData::getColumnRows( const 
OUString& columnNamePattern )
+Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getColumns(
+    const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& 
/*tableNamePattern*/,
+    const OUString& columnNamePattern )
 {
+    // this returns an empty resultset where the column-names are already set
+    // in special the metadata of the resultset already returns the right 
columns
+    rtl::Reference<ODatabaseMetaDataResultSet> pResultSet = new 
ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumns );
+
     ODatabaseMetaDataResultSet::ORows aRows;
     ODatabaseMetaDataResultSet::ORow  aRow(19);
 
@@ -309,7 +315,9 @@ ODatabaseMetaDataResultSet::ORows 
OEvoabDatabaseMetaData::getColumnRows( const O
         }
     }
 
-    return aRows ;
+    pResultSet->setRows(std::move(aRows));
+
+    return pResultSet;
 }
 
 OUString OEvoabDatabaseMetaData::impl_getCatalogSeparator_throw(  )
@@ -1046,18 +1054,6 @@ Reference< XResultSet > 
OEvoabDatabaseMetaData::impl_getTypeInfo_throw(  )
     return pResultSet;
 }
 
-Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getColumns(
-    const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& 
/*tableNamePattern*/,
-    const OUString& columnNamePattern )
-{
-    // this returns an empty resultset where the column-names are already set
-    // in special the metadata of the resultset already returns the right 
columns
-    rtl::Reference<ODatabaseMetaDataResultSet> pResultSet = new 
ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumns );
-    pResultSet->setRows( getColumnRows( columnNamePattern ) );
-    return pResultSet;
-}
-
-
 bool isSourceBackend(ESource *pSource, const char *backendname)
 {
     if (!pSource || !e_source_has_extension (pSource, 
E_SOURCE_EXTENSION_ADDRESS_BOOK))
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx 
b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
index b5f504425d95..a64c234e6a52 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
@@ -65,8 +65,6 @@ namespace connectivity::evoab
         {
             OEvoabConnection*                      m_pConnection;
 
-            ODatabaseMetaDataResultSet::ORows getColumnRows( const OUString& 
columnNamePattern );
-
         protected:
             virtual css::uno::Reference< css::sdbc::XResultSet > 
impl_getTypeInfo_throw() override;
             // cached database information