Tag: cws_src680_oj17 User: oj Date: 06/03/10 03:56:01 Modified: /dba/dbaccess/source/ui/querydesign/ QueryTableView.cxx
Log: #129492# stl usage error File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: QueryTableView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/QueryTableView.cxx?r1=1.35&r2=1.35.94.1 Delta lines: +9 -8 ------------------- --- QueryTableView.cxx 23 Sep 2005 12:43:42 -0000 1.35 +++ QueryTableView.cxx 10 Mar 2006 11:55:58 -0000 1.35.94.1 @@ -4,9 +4,9 @@ * * $RCSfile: QueryTableView.cxx,v $ * - * $Revision: 1.35 $ + * $Revision: 1.35.94.1 $ * - * last change: $Author: hr $ $Date: 2005/09/23 12:43:42 $ + * last change: $Author: oj $ $Date: 2006/03/10 11:55:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -397,7 +397,7 @@ String strTabExistenceTest = pTabConnData->GetSourceWinName(); sal_Bool bInvalid = ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); strTabExistenceTest = pTabConnData->GetDestWinName(); - bInvalid |= ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); + bInvalid = bInvalid && ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); if (bInvalid) { // nein -> Pech gehabt, die Connection faellt weg @@ -934,10 +934,11 @@ getDesignView()->SaveTabWinUIConfig(pTabWin); // (ich muss ueber das Parent gehen, da nur das die Position der Scrollbars kennt) // dann aus der Liste der TabWins raus und verstecken - OTableWindowMap::iterator aIter = pTabWins->begin(); - for(;aIter != pTabWins->end();++aIter) - if(aIter->second == pTabWin) - pTabWins->erase(aIter); + pTabWins->erase( + ::std::find_if( pTabWins->begin(), + pTabWins->end(), + ::std::compose1(::std::bind2nd(::std::equal_to<OTableWindow*>(),pTabWin),::std::select2nd<OTableWindowMap::value_type>())) + ,pTabWins->end()); pTabWin->Hide(); // nicht zerstoeren, steht im Undo!! --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
