User: kz Date: 2007-05-10 10:38:29+0000 Log: INTEGRATION: CWS dba23a (1.40.74); FILE MERGED 2007/02/26 11:48:19 fs 1.40.74.2: remove unused code Issue number: #i74804# Submitted by: [EMAIL PROTECTED] Reviewed by: [EMAIL PROTECTED] 2007/02/21 10:34:03 fs 1.40.74.1: #145033# addConnections: survive (invalid) NULL columns
File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: QueryTableView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/QueryTableView.cxx?r1=1.40&r2=1.41 Delta lines: +5 -11 -------------------- --- QueryTableView.cxx 2006-09-17 07:23:21+0000 1.40 +++ QueryTableView.cxx 2007-05-10 10:38:27+0000 1.41 @@ -270,7 +270,11 @@ for(sal_Int32 i=0;pBegin != pEnd;++pBegin,++i) { Reference<XPropertySet> xColumn; - ::cppu::extractInterface(xColumn,_rxSourceForeignKeyColumns->getByName(*pBegin)); + if ( !( _rxSourceForeignKeyColumns->getByName(*pBegin) >>= xColumn ) ) + { + OSL_ENSURE( false, "addConnections: invalid foreign key column!" ); + continue; + } aNewConnData.SetFieldType(JTCS_FROM,TAB_NORMAL_FIELD); @@ -857,16 +861,6 @@ } //------------------------------------------------------------------------------ -sal_Bool OQueryTableView::RemoveTabWin(const String& strAliasName) -{ - DBG_CHKTHIS(OQueryTableView,NULL); - OQueryTableWindow* pTabWin = FindTable(strAliasName); - if ( pTabWin ) - RemoveTabWin(pTabWin); - return pTabWin != NULL; -} - -//------------------------------------------------------------------------------ void OQueryTableView::RemoveTabWin(OTableWindow* pTabWin) { DBG_CHKTHIS(OQueryTableView,NULL); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
