From 20380f26b47faffe0cf541f46b8706439a5d4219 Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane Date: Thu, 1 Nov 2012 10:36:44 +0100 Subject: Retrieve CatalogName only once, too --- connectivity/source/commontools/TIndexColumns.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'connectivity') diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx index 1cee8098d837..7edd3ea706df 100644 --- a/connectivity/source/commontools/TIndexColumns.cxx +++ b/connectivity/source/commontools/TIndexColumns.cxx @@ -48,12 +48,12 @@ sdbcx::ObjectType OIndexColumns::createObject(const ::rtl::OUString& _rName) { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); ::rtl::OUString aSchema,aTable; + ::com::sun::star::uno::Any Catalog(m_pIndex->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME))); m_pIndex->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; m_pIndex->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; Reference< XResultSet > xResult = m_pIndex->getTable()->getConnection()->getMetaData()->getIndexInfo( - m_pIndex->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)), - aSchema,aTable,sal_False,sal_False); + Catalog, aSchema, aTable, sal_False, sal_False); sal_Bool bAsc = sal_True; if ( xResult.is() ) @@ -68,8 +68,7 @@ sdbcx::ObjectType OIndexColumns::createObject(const ::rtl::OUString& _rName) } xResult = m_pIndex->getTable()->getConnection()->getMetaData()->getColumns( - m_pIndex->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)), - aSchema,aTable,_rName); + Catalog, aSchema, aTable, _rName); sdbcx::ObjectType xRet; if ( xResult.is() ) -- cgit