User: hr Date: 05/09/23 05:41:52 Modified: /dba/dbaccess/source/ui/querydesign/ JoinController.cxx
Log: INTEGRATION: CWS dba201b (1.33.36); FILE MERGED 2005/09/21 10:03:26 oj 1.33.36.3: RESYNC: (1.33-1.34); FILE MERGED 2005/07/11 13:37:26 fs 1.33.36.2: merging CWS dba201 into CWS dba201b 2005/07/06 09:28:56 oj 1.33.36.1: #123660# use erase of vector only in conjunction with remove and not find File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: JoinController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/JoinController.cxx?r1=1.34&r2=1.35 Delta lines: +2 -2 ------------------- --- JoinController.cxx 8 Sep 2005 16:19:20 -0000 1.34 +++ JoinController.cxx 23 Sep 2005 12:41:49 -0000 1.35 @@ -282,7 +282,7 @@ m_pAddTabDlg = getJoinView()->getAddTableDialog(); if(m_pAddTabDlg->IsVisible()) { - ::dbaui::notifySystemWindow(getView(),m_pAddTabDlg,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); + // ::dbaui::notifySystemWindow(getView(),m_pAddTabDlg,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); m_pAddTabDlg->Show(!m_pAddTabDlg->IsVisible()); m_pView->GrabFocus(); } @@ -320,7 +320,7 @@ // ----------------------------------------------------------------------------- void OJoinController::removeConnectionData(OTableConnectionData* _pData) { - m_vTableConnectionData.erase( ::std::find(m_vTableConnectionData.begin(),m_vTableConnectionData.end(),_pData)); + m_vTableConnectionData.erase( ::std::remove(m_vTableConnectionData.begin(),m_vTableConnectionData.end(),_pData),m_vTableConnectionData.end()); } // ----------------------------------------------------------------------------- void OJoinController::describeSupportedFeatures() --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
