Tag: cws_dev300_dba30d User: oj Date: 2008-05-30 10:56:25+0000 Modified: dba/dbaccess/source/ui/querydesign/JoinTableView.cxx
Log: resolve merge conflict File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: JoinTableView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/JoinTableView.cxx?r1=1.59.30.2&r2=1.59.30.3 Delta lines: +6 -5 ------------------- --- JoinTableView.cxx 2008-05-29 15:13:41+0000 1.59.30.2 +++ JoinTableView.cxx 2008-05-30 10:56:22+0000 1.59.30.3 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: JoinTableView.cxx,v $ - * $Revision: 1.59.30.2 $ + * $Revision: 1.59.30.3 $ * * This file is part of OpenOffice.org. * @@ -447,11 +447,12 @@ ); pTabWin->Hide(); - TTableWindowData::iterator aFind = ::std::find(m_pView->getController()->getTableWindowData()->begin(),m_pView->getController()->getTableWindowData()->end(),pData); - if(aFind != m_pView->getController()->getTableWindowData()->end()) + OJoinController& rController = m_pView->getController(); + TTableWindowData::iterator aFind = ::std::find(rController.getTableWindowData()->begin(),rController.getTableWindowData()->end(),pData); + if(aFind != rController.getTableWindowData()->end()) { - m_pView->getController()->getTableWindowData()->erase(aFind); - m_pView->getController()->setModified(sal_True); + rController.getTableWindowData()->erase(aFind); + rController.setModified(sal_True); } String aWinName = pTabWin->GetWinName(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
