User: ihi Date: 2006/08/04 06:57:39 Modified: dba/dbaccess/source/ui/querydesign/QueryDesignView.cxx
Log: INTEGRATION: CWS dba204c (1.80.8); FILE MERGED 2006/07/19 13:37:35 fs 1.80.8.1: #i67530# properly initialize the field list when encountering expressions File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: QueryDesignView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/QueryDesignView.cxx?r1=1.80&r2=1.81 Delta lines: +5 -12 -------------------- --- QueryDesignView.cxx 10 Jul 2006 15:41:12 -0000 1.80 +++ QueryDesignView.cxx 4 Aug 2006 13:57:37 -0000 1.81 @@ -2167,19 +2167,12 @@ aInfo->SetTabWindow( NULL ); // since we support queries in queries, the thingie might belong to an existing "table" - if ( !lcl_findColumnInTables( aColumns, *pTabList, aInfo ) ) + OQueryTableWindow* pExistingTable = lcl_findColumnInTables( aColumns, *pTabList, aInfo ); + if ( pExistingTable ) { - // okay, it doesn't belong to a query directly. In this case, it must belong - // to the (only) table in the FROM part - DBG_ASSERT( pTabList->size() == 1, "InstallFields: unqualified expression, but more or less than one table!" ); - if ( !pTabList->empty() ) - { - OQueryTableWindow* pWindow = static_cast< OQueryTableWindow* >( pTabList->begin()->second ); - aInfo->SetTabWindow( pWindow ); - aInfo->SetTable( pWindow->GetTableName() ); - aInfo->SetAlias( pWindow->GetAliasName() ); - aInfo->SetDatabase( pWindow->GetComposedName() ); - } + aInfo->SetTabWindow( pExistingTable ); + aInfo->SetTable( pExistingTable->GetTableName() ); + aInfo->SetAlias( pExistingTable->GetAliasName() ); } aInfo->SetDataType(DataType::DOUBLE); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
