diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-05-10 09:38:27 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-05-10 09:38:27 +0000 |
| commit | 7893c8d8ef3ef93d9f3dc8cc6db23c27eeae6c47 (patch) | |
| tree | 57e49cc5116a7a812bba64595c03df8b6db073dd /dbaccess | |
| parent | b8ecc568b6232343b3e4e844ba7b2f3818bde086 (diff) | |
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: jnavrati@openoffice.org
Reviewed by: frank.schoenheit@sun.com
2007/02/21 10:34:03 fs 1.40.74.1: #145033# addConnections: survive (invalid) NULL columns
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/querydesign/QueryTableView.cxx | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index b293cbca339d..36ccce241807 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -4,9 +4,9 @@ * * $RCSfile: QueryTableView.cxx,v $ * - * $Revision: 1.40 $ + * $Revision: 1.41 $ * - * last change: $Author: obo $ $Date: 2006-09-17 07:23:21 $ + * last change: $Author: kz $ $Date: 2007-05-10 10:38:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -270,7 +270,11 @@ namespace 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::FindTableFromField(const String& rFieldName, OTableFie } //------------------------------------------------------------------------------ -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); |