diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:46:58 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:46:58 +0000 |
| commit | bdcc917710e1427ae198548aca43df97cfce2f8f (patch) | |
| tree | f4a5f8ff6f83440a8ab6471ee22963788665743c /svtools | |
| parent | 8586872dd5ff6ab7d92485a29545d1ef9f5d84be (diff) | |
INTEGRATION: CWS dba202d (1.18.64); FILE MERGED
2006/01/24 09:57:15 fs 1.18.64.2: RESYNC: (1.18-1.19); FILE MERGED
2006/01/23 12:33:10 oj 1.18.64.1: ##i48614# send some events
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/contnr/ivctrl.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 5f1612a13652..5b3de4c0cf75 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ivctrl.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: kz $ $Date: 2006-01-03 16:07:25 $ + * last change: $Author: kz $ $Date: 2006-01-31 18:46:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -332,7 +332,8 @@ void SvtIconChoiceCtrl::GetFocus() Control::GetFocus(); ULONG nPos; SvxIconChoiceCtrlEntry* pSelectedEntry = GetSelectedEntry ( nPos ); - _pImp->CallEventListeners( VCLEVENT_LISTBOX_SELECT, pSelectedEntry ); + if ( pSelectedEntry ) + _pImp->CallEventListeners( VCLEVENT_LISTBOX_SELECT, pSelectedEntry ); } void SvtIconChoiceCtrl::LoseFocus() @@ -442,7 +443,10 @@ void SvtIconChoiceCtrl::ClickIcon() ULONG nPos; SvxIconChoiceCtrlEntry* pSelectedEntry = GetSelectedEntry ( nPos ); _aClickIconHdl.Call( this ); - _pImp->CallEventListeners( VCLEVENT_LISTBOX_SELECT, pSelectedEntry ); +/* + if ( pSelectedEntry ) + _pImp->CallEventListeners( VCLEVENT_LISTBOX_SELECT, pSelectedEntry ); +*/ } BOOL SvtIconChoiceCtrl::IsEntryEditing() const { |