From 3b6ba84a21f90bd1619999cf2445c62c71124513 Mon Sep 17 00:00:00 2001
From: Lionel Elie Mamane <lionel@mamane.lu>
Date: Fri, 2 Nov 2012 12:24:35 +0100
Subject: connectivity: port macab driver to new OColumn, too

Change-Id: I88a64a19d9f2812a77f0a71f31fe8314732ec44f
---
 connectivity/source/drivers/macab/MacabColumns.cxx | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'connectivity/source')

diff --git a/connectivity/source/drivers/macab/MacabColumns.cxx b/connectivity/source/drivers/macab/MacabColumns.cxx
index 4d0b064ce28b..107ab4575784 100644
--- a/connectivity/source/drivers/macab/MacabColumns.cxx
+++ b/connectivity/source/drivers/macab/MacabColumns.cxx
@@ -37,11 +37,12 @@ using namespace ::com::sun::star::lang;
 // -------------------------------------------------------------------------
 sdbcx::ObjectType MacabColumns::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 MacabColumns::createObject(const ::rtl::OUString& _rName)
                         sal_False,
                         sal_False,
                         sal_False,
-                        sal_True);
+                        sal_True,
+                        sCatalogName,
+                        sSchemaName,
+                        sTableName);
                 xRet = pRet;
                 break;
             }
-- 
cgit