From 37e23db765daac914b4c1d6e3efff612390494f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Fri, 1 Dec 2006 16:30:37 +0000 Subject: [PATCH] INTEGRATION: CWS dba22a (1.14.2); FILE MERGED 2006/11/15 08:49:49 fs 1.14.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. --- dbaccess/source/ui/control/dbtreelistbox.cxx | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 59a67f09a955..721697f6c268 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -4,9 +4,9 @@ * * $RCSfile: dbtreelistbox.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: obo $ $Date: 2006-10-12 13:36:23 $ + * last change: $Author: rt $ $Date: 2006-12-01 17:30:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -496,6 +496,15 @@ BOOL DBTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText return FALSE; // we never want that the base change our text } + +// ----------------------------------------------------------------------------- +BOOL DBTreeListBox::DoubleClickHdl() +{ + long nResult = aDoubleClickHdl.Call( this ); + // continue default processing if the DoubleClickHandler didn't handle it + return nResult == 0; +} + // ----------------------------------------------------------------------------- void scrollWindow(DBTreeListBox* _pListBox, const Point& _rPos,sal_Bool _bUp) {