Tag: cws_src680_dba26 User: oj Date: 05/03/11 04:08:07 Modified: /dba/dbaccess/source/ui/querydesign/ JoinController.cxx, JoinDesignView.cxx
Log: #i42067# set addtabdlg to null beforeview is set to null 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.32&r2=1.32.60.1 Delta lines: +5 -5 ------------------- --- JoinController.cxx 16 Nov 2004 14:32:37 -0000 1.32 +++ JoinController.cxx 11 Mar 2005 12:08:04 -0000 1.32.60.1 @@ -2,9 +2,9 @@ * * $RCSfile: JoinController.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.32.60.1 $ * - * last change: $Author: obo $ $Date: 2004/11/16 14:32:37 $ + * last change: $Author: oj $ $Date: 2005/03/11 12:08:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -213,8 +213,8 @@ { OJoinController_BASE::disposing(); - m_pView = NULL; m_pAddTabDlg = NULL; + m_pView = NULL; { ::std::vector< OTableConnectionData*>::iterator aIter = m_vTableConnectionData.begin(); File [changed]: JoinDesignView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/JoinDesignView.cxx?r1=1.14&r2=1.14.100.1 Delta lines: +5 -3 ------------------- --- JoinDesignView.cxx 9 Sep 2004 09:47:56 -0000 1.14 +++ JoinDesignView.cxx 11 Mar 2005 12:08:04 -0000 1.14.100.1 @@ -2,9 +2,9 @@ * * $RCSfile: JoinDesignView.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.14.100.1 $ * - * last change: $Author: rt $ $Date: 2004/09/09 09:47:56 $ + * last change: $Author: oj $ $Date: 2005/03/11 12:08:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -143,6 +143,8 @@ // ----------------------------------------------------------------------------- OJoinDesignView::~OJoinDesignView() { + if ( m_pController ) + m_pController->clearAddTableDialog(); ::std::auto_ptr<Window> aT3(m_pScrollWindow); m_pScrollWindow = NULL; ::std::auto_ptr<Window> aT2(m_pTableView); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
