User: hr Date: 2007-09-26 14:52:59+0000 Modified: dba/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
Log: INTEGRATION: CWS dba24a (1.78.34); FILE MERGED 2007/09/20 06:38:05 oj 1.78.34.2: #i69428# check table alias name 2007/08/28 08:34:53 oj 1.78.34.1: #i69428# erase table from field name File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: SelectionBrowseBox.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx?r1=1.78&r2=1.79 Delta lines: +3 -2 ------------------- --- SelectionBrowseBox.cxx 2007-05-10 10:38:56+0000 1.78 +++ SelectionBrowseBox.cxx 2007-09-26 14:52:56+0000 1.79 @@ -1027,11 +1027,12 @@ static_cast<OQueryController*>(getDesignView()->getController())->getUndoMgr()->EnterListAction(String(),String()); USHORT nPos = m_pFieldCell->GetEntryPos(aFieldName); - if ( nPos != COMBOBOX_ENTRY_NOTFOUND && aFieldName.GetTokenCount('.') > 1 ) + String aAliasName = pEntry->GetAlias(); + if ( nPos != COMBOBOX_ENTRY_NOTFOUND && !aAliasName.Len() && aFieldName.GetTokenCount('.') > 1 ) { // special case, we have a table field so we must cut the table name String sTableAlias = aFieldName.GetToken(0,'.'); pEntry->SetAlias(sTableAlias); - String sColumnName = aFieldName.GetToken(1,'.'); + String sColumnName = aFieldName.Copy(sTableAlias.Len()+1,aFieldName.Len() - sTableAlias.Len() -1); Reference<XConnection> xConnection = pController->getConnection(); if ( !xConnection.is() ) return sal_False; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
