diff options
| author | Pascal Junck <pjunck@openoffice.org> | 2004-10-22 11:13:22 +0000 |
|---|---|---|
| committer | Pascal Junck <pjunck@openoffice.org> | 2004-10-22 11:13:22 +0000 |
| commit | 4cb8401a4429a0bf79a82bc336b57f38c26bb5a3 (patch) | |
| tree | 2d4bee722c5ff9b6801f14b157a1adb30614e867 /vcl | |
| parent | aaf1becc16f475f8a06233a58e24fc1f92e53190 (diff) | |
INTEGRATION: CWS dba17 (1.29.70); FILE MERGED
2004/09/20 14:51:27 fs 1.29.70.2: RESYNC: (1.29-1.30); FILE MERGED
2004/09/08 13:18:55 fs 1.29.70.1: #i33728# (approved by ssa) ImplCallEventListeners
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/lstbox.cxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index 4e0ff3db3e34..0c23cdc1f2d7 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -2,9 +2,9 @@ * * $RCSfile: lstbox.cxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: hr $ $Date: 2004-09-08 17:48:00 $ + * last change: $Author: pjunck $ $Date: 2004-10-22 12:13:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -365,7 +365,14 @@ IMPL_LINK( ListBox, ImplPopupModeEndHdl, void*, p ) mpImplLB->SelectEntry( mpFloatWin->GetPopupModeStartSaveSelection(), TRUE ); BOOL bTravelSelect = mpImplLB->IsTravelSelect(); mpImplLB->SetTravelSelect( TRUE ); + + ImplDelData aCheckDelete; + ImplAddDel( &aCheckDelete ); Select(); + if ( aCheckDelete.IsDelete() ) + return 0; + ImplRemoveDel( &aCheckDelete ); + mpImplLB->SetTravelSelect( bTravelSelect ); } } @@ -986,16 +993,14 @@ long ListBox::PreNotify( NotifyEvent& rNEvt ) void ListBox::Select() { - ImplCallEventListeners( VCLEVENT_LISTBOX_SELECT ); - maSelectHdl.Call( this ); + ImplCallEventListenersAndHandler( VCLEVENT_LISTBOX_SELECT, maSelectHdl, this ); } // ----------------------------------------------------------------------- void ListBox::DoubleClick() { - ImplCallEventListeners( VCLEVENT_LISTBOX_DOUBLECLICK ); - maDoubleClickHdl.Call( this ); + ImplCallEventListenersAndHandler( VCLEVENT_LISTBOX_DOUBLECLICK, maDoubleClickHdl, this ); } // ----------------------------------------------------------------------- |