Tag: cws_ooo300_dba301a User: oj Date: 2008-10-16 13:28:23+0000 Modified: dba/dbaccess/source/ui/querydesign/QueryDesignView.cxx dba/dbaccess/source/ui/querydesign/TableWindow.cxx
Log: #i94803# change table_ref for ( joined_table ) and remove ( ) around 2nd join 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.96&r2=1.96.18.1 Delta lines: +9 -8 ------------------- --- QueryDesignView.cxx 2008-07-25 07:52:25+0000 1.96 +++ QueryDesignView.cxx 2008-10-16 13:28:19+0000 1.96.18.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: QueryDesignView.cxx,v $ - * $Revision: 1.96 $ + * $Revision: 1.96.18.1 $ * * This file is part of OpenOffice.org. * @@ -641,15 +641,11 @@ } else if(pEntryTabTo == pEntryConn->GetDestWin()) { - ::rtl::OUString aTmpJoin('('); - (aTmpJoin += aJoin) += ::rtl::OUString(')'); - aJoin = BuildJoin(_xConnection,aTmpJoin,pEntryTabTo,pEntryConnData); + aJoin = BuildJoin(_xConnection,aJoin,pEntryTabTo,pEntryConnData); } else if(pEntryTabTo == pEntryConn->GetSourceWin()) { - ::rtl::OUString aTmpJoin('('); - (aTmpJoin += aJoin) += ::rtl::OUString(')'); - aJoin = BuildJoin(_xConnection,pEntryTabTo,aTmpJoin,pEntryConnData); + aJoin = BuildJoin(_xConnection,pEntryTabTo,aJoin,pEntryConnData); } pEntryConn->SetVisited(sal_True); @@ -1912,6 +1908,11 @@ sal_Bool bRet = sal_True; if (SQL_ISRULE(_pNode,qualified_join)) pJoinNode = _pNode; + else if (SQL_ISRULE(_pNode,table_ref) + && _pNode->count() == 3 + && SQL_ISPUNCTUATION(_pNode->getChild(0),"(") + && SQL_ISPUNCTUATION(_pNode->getChild(2),")") ) // '(' joined_table ')' + pJoinNode = _pNode->getChild(1); else if (! ( SQL_ISRULE(_pNode, table_ref) && _pNode->count() == 2) ) // table_node table_primary_as_range_column bRet = sal_False; File [changed]: TableWindow.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/TableWindow.cxx?r1=1.41&r2=1.41.34.1 Delta lines: +4 -3 ------------------- --- TableWindow.cxx 2008-06-25 12:54:20+0000 1.41 +++ TableWindow.cxx 2008-10-16 13:28:20+0000 1.41.34.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: TableWindow.cxx,v $ - * $Revision: 1.41 $ + * $Revision: 1.41.34.1 $ * * This file is part of OpenOffice.org. * @@ -171,7 +171,8 @@ OSL_ENSURE(m_pListBox->GetEntryCount()==0,"Forgot to call EmptyListbox()!"); ::std::auto_ptr<Window> aTemp(m_pListBox); m_pListBox = NULL; - } + } // if (m_pListBox) + m_pAccessible = NULL; } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
