Tag: cws_src680_visibility03 User: mhu Date: 05/04/06 07:43:16 Modified: /dba/dbaccess/source/ui/querydesign/ QueryDesignView.cxx
Log: RESYNC: (1.72-1.73); FILE MERGED 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.71.12.2&r2=1.71.12.3 Delta lines: +13 -1 -------------------- --- QueryDesignView.cxx 24 Mar 2005 21:15:09 -0000 1.71.12.2 +++ QueryDesignView.cxx 6 Apr 2005 14:43:13 -0000 1.71.12.3 @@ -1181,6 +1181,7 @@ ::rtl::OUString aTableListStr; // wird gebraucht um sicher zustelllen das eine Tabelle nicht doppelt vorkommt + map< ::rtl::OUString,sal_Bool,::comphelper::UStringMixLess> aTableNames; // generate outer join clause in from if(!pConnList->empty()) @@ -1200,6 +1201,18 @@ if(aJoin.getLength()) { + // insert tables into table list to avoid double entries + OQueryTableWindow* pEntryTabFrom = static_cast<OQueryTableWindow*>(pEntryConn->GetSourceWin()); + OQueryTableWindow* pEntryTabTo = static_cast<OQueryTableWindow*>(pEntryConn->GetDestWin()); + + ::rtl::OUString sTabName(BuildTable(_xConnection,pEntryTabFrom)); + if(aTableNames.find(sTabName) == aTableNames.end()) + aTableNames[sTabName] = sal_True; + sTabName = BuildTable(_xConnection,pEntryTabTo); + if(aTableNames.find(sTabName) == aTableNames.end()) + aTableNames[sTabName] = sal_True; + + // create join sal_Bool bUseEscape = ::dbtools::isDataSourcePropertyEnabled(_xConnection,PROPERTY_OUTERJOINESCAPE,sal_True); ::rtl::OUString aStr; if ( bUseEscape ) @@ -1214,7 +1227,6 @@ } // and now all inner joins - map< ::rtl::OUString,sal_Bool,::comphelper::UStringMixLess> aTableNames; aIter = pConnList->begin(); for(;aIter != pConnList->end();++aIter) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
