Tag: cws_src680_ooo64bit02 User: hr Date: 05/06/08 06:05:11 Modified: /dba/dbaccess/source/ui/app/ AppDetailPageHelper.cxx
Log: RESYNC: (1.5-1.7); FILE MERGED 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.4.48.2&r2=1.4.48.3 Delta lines: +8 -1 ------------------- --- AppDetailPageHelper.cxx 9 Mar 2005 18:55:44 -0000 1.4.48.2 +++ AppDetailPageHelper.cxx 8 Jun 2005 13:05:08 -0000 1.4.48.3 @@ -711,7 +711,7 @@ _pTreeView->SetDoubleClickHdl(LINK(this, OAppDetailPageHelper, OnEntryDoubleClick)); _pTreeView->SetEnterKeyHdl(LINK(this, OAppDetailPageHelper, OnEntryDoubleClick)); _pTreeView->SetSelectHdl(LINK(this, OAppDetailPageHelper, OnEntrySelectHdl)); - // _pTreeView->SetDeselectHdl(LINK(this, OAppDetailPageHelper, OnDeSelectHdl)); + _pTreeView->SetDeselectHdl(LINK(this, OAppDetailPageHelper, OnDeSelectHdl)); _pTreeView->setCutHandler(LINK(this, OAppDetailPageHelper, OnCutEntry)); _pTreeView->setCopyHandler(LINK(this, OAppDetailPageHelper, OnCopyEntry)); @@ -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); } } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
