Tag: cws_src680_dba24 User: oj Date: 05/02/21 00:27:12 Modified: /dba/dbaccess/source/ui/app/ AppDetailPageHelper.cxx, AppDetailView.cxx /dba/dbaccess/source/ui/control/ VertSplitView.cxx /dba/dbaccess/source/ui/inc/ VertSplitView.hxx
Log: #i42994# clear preview if entry was deleted File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppDetailPageHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailPageHelper.cxx?r1=1.5&r2=1.5.4.1 Delta lines: +7 -0 ------------------- --- AppDetailPageHelper.cxx 21 Jan 2005 17:06:18 -0000 1.5 +++ AppDetailPageHelper.cxx 21 Feb 2005 08:27:08 -0000 1.5.4.1 @@ -831,16 +831,20 @@ DBTreeListBox* pTreeView = getCurrentView(); if ( pTreeView ) { + SvLBoxEntry* pSelected = pTreeView->GetSelectedEntry(); + sal_Bool bClearPreview = sal_False; switch( _eType ) { case E_TABLE: OSL_ENSURE(_rxConn.is(),"Connection is NULL! ->GPF"); + // we don't need to clear the table here, it is already done by the dispose listener static_cast<OTableTreeListBox*>(pTreeView)->removedTable(_rxConn,_rName); break; case E_QUERY: if ( pTreeView ) { SvLBoxEntry* pEntry = lcl_findEntry_impl(*pTreeView,_rName,pTreeView->First()); + bClearPreview = pSelected == pEntry; if ( pEntry ) pTreeView->GetModel()->Remove(pEntry); } @@ -851,6 +855,7 @@ if ( pTreeView ) { SvLBoxEntry* pEntry = lcl_findEntry(*pTreeView,_rName,pTreeView->First()); + bClearPreview = pSelected == pEntry; if ( pEntry ) pTreeView->GetModel()->Remove(pEntry); } @@ -859,6 +864,8 @@ default: OSL_ENSURE(0,"Invalid element type"); } + if ( bClearPreview && pSelected ) + showPreview(NULL); } } // ----------------------------------------------------------------------------- File [changed]: AppDetailView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailView.cxx?r1=1.6.4.2&r2=1.6.4.3 Delta lines: +4 -2 ------------------- --- AppDetailView.cxx 11 Feb 2005 12:32:21 -0000 1.6.4.2 +++ AppDetailView.cxx 21 Feb 2005 08:27:08 -0000 1.6.4.3 @@ -526,7 +526,7 @@ const long nFrameWidth = LogicToPixel( Size( 3, 0 ), MAP_APPFONT ).Width(); m_aHorzSplitter.SetPosSizePixel( Point(0,50), Size(0,nFrameWidth) ); // now set the components at the base class - init(&m_aContainer,&m_aTasks); + set(&m_aContainer,&m_aTasks); m_aHorzSplitter.Show(); m_aHorzSplitter.SetUniqueId(UID_APP_VIEW_HORZ_SPLIT); @@ -536,6 +536,8 @@ OApplicationDetailView::~OApplicationDetailView() { DBG_DTOR(OApplicationDetailView,NULL); + set(NULL,NULL); + setSplitter(NULL); m_pControlHelper = NULL; } // ----------------------------------------------------------------------------- Directory: /dba/dbaccess/source/ui/control/ =========================================== File [changed]: VertSplitView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/control/VertSplitView.cxx?r1=1.2&r2=1.2.80.1 Delta lines: +4 -4 ------------------- --- VertSplitView.cxx 2 Aug 2004 15:35:56 -0000 1.2 +++ VertSplitView.cxx 21 Feb 2005 08:27:09 -0000 1.2.80.1 @@ -232,7 +232,7 @@ } // ----------------------------------------------------------------------------- -void OSplitterView::init(Window* _pRight,Window* _pLeft) +void OSplitterView::set(Window* _pRight,Window* _pLeft) { m_pLeft = _pLeft; m_pRight = _pRight; Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: VertSplitView.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/VertSplitView.hxx?r1=1.2&r2=1.2.80.1 Delta lines: +4 -4 ------------------- --- VertSplitView.hxx 2 Aug 2004 15:55:09 -0000 1.2 +++ VertSplitView.hxx 21 Feb 2005 08:27:09 -0000 1.2.80.1 @@ -86,7 +86,7 @@ virtual void GetFocus(); void setSplitter(Splitter* _pSplitter); - void init(Window* _pRight,Window* _pLeft = NULL); + void set(Window* _pRight,Window* _pLeft = NULL); virtual void Resize(); }; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
