[Libreoffice-commits] .: connectivity/source

[Libreoffice Gerrit user]

 connectivity/source/drivers/mork/MColumns.cxx           |   13 ++++++++++---
 connectivity/source/drivers/mork/MPreparedStatement.cxx |    5 ++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit faddfd35e2c11554a6892300c3d3540ea4e6be22
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Fri Nov 2 11:13:12 2012 +0100

    connectivity: port mork driver to new OColumn, too
    
    Change-Id: I2433bd2cc289b9ded1c825ea3dbe1db2ccf4bae9

diff --git a/connectivity/source/drivers/mork/MColumns.cxx b/connectivity/source/drivers/mork/MColumns.cxx
index 852bb4d..d35151d 100644
--- a/connectivity/source/drivers/mork/MColumns.cxx
+++ b/connectivity/source/drivers/mork/MColumns.cxx
@@ -42,8 +42,12 @@ using namespace ::com::sun::star::lang;
 
 sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName)
 {
-    Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getColumns(Any(),
-    m_pTable->getSchema(),m_pTable->getTableName(),_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(
+        aCatalog, sSchemaName, sTableName, _rName);
 
     sdbcx::ObjectType xRet = NULL;
     if(xResult.is())
@@ -65,7 +69,10 @@ sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName)
                                             nPrec,
                                             xRow->getInt(9),
                                             nType,
-                                            sal_False,sal_False,sal_False,sal_True);
+                                            sal_False,sal_False,sal_False,sal_True,
+                                            sCatalogName,
+                                            sSchemaName,
+                                            sTableName));
                 xRet = pRet;
                 break;
             }
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx
index c34de94..803b960 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx
@@ -442,7 +442,10 @@ size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere
                                                     ,sal_False
                                                     ,sal_False
                                                     ,sal_False
-                                                    ,m_pSQLIterator->isCaseSensitive());
+                                                    ,m_pSQLIterator->isCaseSensitive()
+                                                    ,::rtl::OUString()
+                                                    ,::rtl::OUString()
+                                                    ,::rtl::OUString());
     m_xParamColumns->get().push_back(xParaColumn);
     return nParameter;
 }