User: rt Date: 2006/12/01 09:30:26 Modified: dba/dbaccess/source/ui/browser/unodatbr.cxx
Log: INTEGRATION: CWS dba22a (1.182.2); FILE MERGED 2006/11/15 08:49:49 fs 1.182.2.1: #142997# modified the double-click handling in the DBTreeListBox various stack trace reports suggest there are scenarios where a double click handler somehow destroys/corrupts the list box and/or its entries, but the subsequent default handling in the SvListBox class accesses those corrupted entities. Since we're not able to reproduce any of those crashs, the handling in the DBTreeListBox and its clients now is as follows: If a double click is handled, then the DBTreeListBox::DoubleClickHdl will return 0, this way causing the SvListBox to *not* process the double click event further. File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: unodatbr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/unodatbr.cxx?r1=1.183&r2=1.184 Delta lines: +0 -14 -------------------- --- unodatbr.cxx 21 Nov 2006 17:16:28 -0000 1.183 +++ unodatbr.cxx 1 Dec 2006 17:30:23 -0000 1.184 @@ -571,7 +571,6 @@ m_pTreeModel->SetCompareHdl(LINK(this, SbaTableQueryBrowser, OnTreeEntryCompare)); m_pTreeView->setModel(m_pTreeModel); m_pTreeView->setSelectHdl(LINK(this, SbaTableQueryBrowser, OnSelectEntry)); - m_pTreeView->getListBox()->SetDoubleClickHdl(LINK(this, SbaTableQueryBrowser, OnEntryDoubleClicked)); // TODO getBrowserView()->getVclControl()->GetDataWindow().SetUniqueId(UID_DATABROWSE_DATAWINDOW); @@ -2276,19 +2275,6 @@ return bSuccess; } -//------------------------------------------------------------------------------ -IMPL_LINK(SbaTableQueryBrowser, OnEntryDoubleClicked, SvLBoxEntry*, /*_pEntry*/) -{ - SvLBoxEntry* pSelected = m_pTreeView->getListBox()->FirstSelected(); - if (!pSelected) - { - DBG_ERROR("SbaTableQueryBrowser::OnEntryDoubleClicked: invalid selection!"); - return 0L; - } - - return 1L; -}; - //------------------------------------------------------------------------------ sal_Bool SbaTableQueryBrowser::implSelect(const ::svx::ODataAccessDescriptor& _rDescriptor,sal_Bool _bSelectDirect) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
