connectivity/source/drivers/macab/MacabColumns.cxx | 14 +++++++++----- dbaccess/source/core/api/definitioncolumn.cxx | 1 + 2 files changed, 10 insertions(+), 5 deletions(-)
New commits: commit 3b6ba84a21f90bd1619999cf2445c62c71124513 Author: Lionel Elie Mamane <[email protected]> Date: Fri Nov 2 12:24:35 2012 +0100 connectivity: port macab driver to new OColumn, too Change-Id: I88a64a19d9f2812a77f0a71f31fe8314732ec44f diff --git a/connectivity/source/drivers/macab/MacabColumns.cxx b/connectivity/source/drivers/macab/MacabColumns.cxx index 4d0b064..107ab45 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; } commit 25a868011c15cb51e38566deff116b01fa8419cf Author: Lionel Elie Mamane <[email protected]> Date: Fri Nov 2 12:21:47 2012 +0100 include stl headers for used features Change-Id: I6b0d3b3feea88b6e3605f751df9e1154e4231127 diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx index e8e0acd..df9a92a 100644 --- a/dbaccess/source/core/api/definitioncolumn.cxx +++ b/dbaccess/source/core/api/definitioncolumn.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <bitset> #include "apitools.hxx" #include "dbastrings.hrc" _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
