Tag: cws_src680_warnings01 User: sb Date: 06/04/07 13:24:38 Modified: /dba/connectivity/source/drivers/odbc/ ODatabaseMetaData.cxx
Log: RESYNC: (1.29-1.30); FILE MERGED File Changes: Directory: /dba/connectivity/source/drivers/odbc/ ================================================= File [changed]: ODatabaseMetaData.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx?r1=1.29.30.2&r2=1.29.30.3 Delta lines: +17 -8 -------------------- --- ODatabaseMetaData.cxx 16 Nov 2005 12:59:19 -0000 1.29.30.2 +++ ODatabaseMetaData.cxx 7 Apr 2006 20:24:36 -0000 1.29.30.3 @@ -274,20 +274,29 @@ const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException) { Reference< XResultSet > xRef; + bool bSuccess = false; try { + if ( !m_pConnection->preventGetVersionColumns() ) + { ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(m_pConnection); xRef = pResult; pResult->openVersionColumns(m_bUseCatalog ? catalog : Any(),schema,table); + bSuccess = true; + } } catch(SQLException&) { + } + + if ( !bSuccess ) + { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(); xRef = pResult; pResult->setVersionColumnsMap(); } - return xRef; + return xRef; } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
