Tag: cws_src680_os63 User: os Date: 06/05/08 03:32:40 Modified: /dba/dbaccess/source/ui/relationdesign/ RelationTableView.cxx
Log: RESYNC: (1.20-1.21); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/relationdesign/ ================================================== File [changed]: RelationTableView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/relationdesign/RelationTableView.cxx?r1=1.18.144.3&r2=1.18.144.4 Delta lines: +10 -1 -------------------- --- RelationTableView.cxx 16 Nov 2005 10:44:13 -0000 1.18.144.3 +++ RelationTableView.cxx 8 May 2006 10:32:37 -0000 1.18.144.4 @@ -122,7 +122,12 @@ #ifndef DBACCESS_JACCESS_HXX #include "JAccess.hxx" #endif +#ifndef _UNDO_HXX +#include <svtools/undo.hxx> +#endif +#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEEVENTID_HPP_ #include <com/sun/star/accessibility/AccessibleEventId.hpp> +#endif using namespace dbaui; using namespace ::dbtools; @@ -207,7 +212,7 @@ ::rtl::OUString 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 @@ -472,8 +477,12 @@ OSQLMessageBox aDlg(this,ModuleRes(STR_QUERY_REL_DELETE_WINDOW),String(),WB_YES_NO|WB_DEF_YES,OSQLMessageBox::Warning); if(aDlg.Execute() == RET_YES) { + m_pView->getController()->getUndoMgr()->Clear(); OJoinTableView::RemoveTabWin( pTabWin ); + m_pView->getController()->InvalidateFeature(SID_RELATION_ADD_RELATION); + m_pView->getController()->InvalidateFeature(ID_BROWSER_UNDO); + m_pView->getController()->InvalidateFeature(ID_BROWSER_REDO); } } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
