[Libreoffice-commits] .: connectivity/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Nov 2 03:52:58 PDT 2012


 connectivity/source/drivers/kab/KColumns.cxx |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit e3b12f1762c4a7237e0c085484359dbe47ca76e0
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Fri Nov 2 11:52:35 2012 +0100

    connectivity: port kab driver to new OColumn, too
    
    Change-Id: I19657ee92b5d0e1e51d11dd2aa69191fdb0f4f50

diff --git a/connectivity/source/drivers/kab/KColumns.cxx b/connectivity/source/drivers/kab/KColumns.cxx
index a047d1a..5ab9598 100644
--- a/connectivity/source/drivers/kab/KColumns.cxx
+++ b/connectivity/source/drivers/kab/KColumns.cxx
@@ -37,11 +37,12 @@ using namespace ::com::sun::star::lang;
 // -------------------------------------------------------------------------
 sdbcx::ObjectType KabColumns::createObject(const ::rtl::OUString& _rName)
 {
+    const Any aCatalog;
+    const ::rtl::OUString sCatalogName;
+    const ::rtl::OUString sSchemaName(m_pTable->getSchema());
+    const ::rtl::OUString sTableName(m_pTable->getTableName());
     Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getColumns(
-        Any(),
-        m_pTable->getSchema(),
-        m_pTable->getTableName(),
-        _rName);
+        aCatalog, sSchemaName, sTableName, _rName);
 
     sdbcx::ObjectType xRet = NULL;
     if (xResult.is())
@@ -64,7 +65,10 @@ sdbcx::ObjectType KabColumns::createObject(const ::rtl::OUString& _rName)
                         sal_False,
                         sal_False,
                         sal_False,
-                        sal_True);
+                        sal_True,
+                        sCatalogName,
+                        sSchemaName,
+                        sTableName);
                 xRet = pRet;
                 break;
             }


More information about the Libreoffice-commits mailing list