Tag: cws_src680_dba204b User: fs Date: 2006/07/13 04:13:19 Modified: dba/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx dba/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx dba/dbaccess/source/ui/querydesign/QueryTableView.cxx
Log: #i67006# clear pTabWins with a readable, and now correct piece of code File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: QueryTabConnUndoAction.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx?r1=1.5&r2=1.5.150.1 Delta lines: +11 -3 -------------------- --- QueryTabConnUndoAction.cxx 8 Sep 2005 16:25:33 -0000 1.5 +++ QueryTabConnUndoAction.cxx 13 Jul 2006 11:13:16 -0000 1.5.150.1 @@ -4,9 +4,9 @@ * * $RCSfile: QueryTabConnUndoAction.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.5.150.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 16:25:33 $ + * last change: $Author: fs $ $Date: 2006/07/13 11:13:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -117,6 +117,10 @@ { } // ----------------------------------------------------------------------------- +OQueryTabWinShowUndoAct::~OQueryTabWinShowUndoAct() +{ +} +// ----------------------------------------------------------------------------- void OQueryTabWinShowUndoAct::Undo() { static_cast<OQueryTableView*>(m_pOwner)->HideTabWin(m_pTabWin, this); @@ -132,6 +136,10 @@ OQueryTabWinDelUndoAct::OQueryTabWinDelUndoAct(OQueryTableView* pOwner) : OQueryTabWinUndoAct(pOwner, STR_QUERY_UNDO_TABWINDELETE) { +} +// ----------------------------------------------------------------------------- +OQueryTabWinDelUndoAct::~OQueryTabWinDelUndoAct() +{ } // ----------------------------------------------------------------------------- void OQueryTabWinDelUndoAct::Undo() File [changed]: QueryTabWinShowUndoAct.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx?r1=1.4&r2=1.4.150.1 Delta lines: +5 -3 ------------------- --- QueryTabWinShowUndoAct.hxx 8 Sep 2005 16:26:03 -0000 1.4 +++ QueryTabWinShowUndoAct.hxx 13 Jul 2006 11:13:16 -0000 1.4.150.1 @@ -4,9 +4,9 @@ * * $RCSfile: QueryTabWinShowUndoAct.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.150.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 16:26:03 $ + * last change: $Author: fs $ $Date: 2006/07/13 11:13:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -49,6 +49,7 @@ { public: OQueryTabWinShowUndoAct(OQueryTableView* pOwner); + ~OQueryTabWinShowUndoAct(); virtual void Undo(); virtual void Redo(); @@ -61,6 +62,7 @@ { public: OQueryTabWinDelUndoAct(OQueryTableView* pOwner); + ~OQueryTabWinDelUndoAct(); virtual void Undo(); virtual void Redo(); File [changed]: QueryTableView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/QueryTableView.cxx?r1=1.38&r2=1.38.2.1 Delta lines: +10 -8 -------------------- --- QueryTableView.cxx 10 Jul 2006 15:41:36 -0000 1.38 +++ QueryTableView.cxx 13 Jul 2006 11:13:16 -0000 1.38.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: QueryTableView.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.38.2.1 $ * - * last change: $Author: obo $ $Date: 2006/07/10 15:41:36 $ + * last change: $Author: fs $ $Date: 2006/07/13 11:13:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -946,11 +946,13 @@ 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 - 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()); + OTableWindowMap::iterator aIter = pTabWins->begin(); + for ( ;aIter != pTabWins->end(); ++aIter ) + if ( aIter->second == pTabWin ) + { + pTabWins->erase( aIter ); + break; + } pTabWin->Hide(); // nicht zerstoeren, steht im Undo!! --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
