diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 00:09:54 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 00:09:54 +0000 |
| commit | 4f54c59f4851a7b848147e5518e506a7bfd7fc8b (patch) | |
| tree | ce287d12a4d12c8de1ad8c1dbecf9db29704b56c /connectivity/source/drivers/adabas/BKeys.cxx | |
| parent | 153d53a698bb34facedc06767a772f0763b42a78 (diff) | |
INTEGRATION: CWS warnings01 (1.20.30); FILE MERGED
2006/06/08 09:46:17 fs 1.20.30.2: #136883# renaming getMetaData was a bad idea - it's a overridden virtual method
2005/11/21 10:07:42 fs 1.20.30.1: #i57457# warning-free code on unx*
Diffstat (limited to 'connectivity/source/drivers/adabas/BKeys.cxx')
| -rw-r--r-- | connectivity/source/drivers/adabas/BKeys.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/connectivity/source/drivers/adabas/BKeys.cxx b/connectivity/source/drivers/adabas/BKeys.cxx index 8854178661..6072bf8684 100644 --- a/connectivity/source/drivers/adabas/BKeys.cxx +++ b/connectivity/source/drivers/adabas/BKeys.cxx @@ -4,9 +4,9 @@ * * $RCSfile: BKeys.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: rt $ $Date: 2005-09-08 05:22:56 $ + * last change: $Author: hr $ $Date: 2006-06-20 01:09:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -83,7 +83,7 @@ sdbcx::ObjectType OKeys::createObject(const ::rtl::OUString& _rName) if(_rName.getLength()) { - Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getImportedKeys(Any(), + Reference< XResultSet > xResult = m_pTable->getMetaData()->getImportedKeys(Any(), m_pTable->getSchema(),m_pTable->getTableName()); if(xResult.is()) @@ -138,7 +138,7 @@ void OKeys::appendObject( const Reference< XPropertySet >& descriptor ) sal_Int32 nKeyType = getINT32(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))); ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("ALTER TABLE "); - ::rtl::OUString aQuote = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString aQuote = m_pTable->getMetaData()->getIdentifierQuoteString( ); const ::rtl::OUString& sDot = OAdabasCatalog::getDot(); aSql = aSql + aQuote + m_pTable->getSchema() + aQuote + sDot + aQuote + m_pTable->getTableName() + aQuote; @@ -211,7 +211,7 @@ void OKeys::appendObject( const Reference< XPropertySet >& descriptor ) // we need a name for the insertion if(nKeyType == KeyType::FOREIGN) { - Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getImportedKeys(Any(),m_pTable->getSchema(),m_pTable->getTableName()); + Reference< XResultSet > xResult = m_pTable->getMetaData()->getImportedKeys(Any(),m_pTable->getSchema(),m_pTable->getTableName()); if(xResult.is()) { Reference< XRow > xRow(xResult,UNO_QUERY); @@ -236,7 +236,7 @@ void OKeys::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) if(!m_pTable->isNew()) { ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("ALTER TABLE "); - ::rtl::OUString aQuote = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString aQuote = m_pTable->getMetaData()->getIdentifierQuoteString( ); const ::rtl::OUString& sDot = OAdabasCatalog::getDot(); Reference<XPropertySet> xKey(getObject(_nPos),UNO_QUERY); |