diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-09-05 08:01:23 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-09-05 08:01:23 +0000 |
| commit | 9446bc6c0e12472bc2053d6d31f4992580e12982 (patch) | |
| tree | 05da518deb8b9cecf5173fb5f577718aed0746d2 /vcl/source | |
| parent | 97ae05e05666716eed1d8d5090923ab486bc60f7 (diff) | |
INTEGRATION: CWS hr18 (1.89.54); FILE MERGED
2005/08/12 15:45:46 hr 1.89.54.1: #i53258#: ToolBox::ImplChangeHighlightUpDn(): insert check if iterator is no already at end of container before derefencing it
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/window/toolbox.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index bfd8c598ea47..51373915c43d 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -2,9 +2,9 @@ * * $RCSfile: toolbox.cxx,v $ * - * $Revision: 1.89 $ + * $Revision: 1.90 $ * - * last change: $Author: obo $ $Date: 2005-07-06 09:21:30 $ + * last change: $Author: rt $ $Date: 2005-09-05 09:01:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -6164,7 +6164,7 @@ BOOL ToolBox::ImplChangeHighlightUpDn( BOOL bUp, BOOL bNoCycle ) } // select the menu button if a clipped item would be selected - if( &(*it) == ImplGetFirstClippedItem( this ) && IsMenuEnabled() ) + if( (it != mpData->m_aItems.end() && &(*it) == ImplGetFirstClippedItem( this )) && IsMenuEnabled() ) { ImplChangeHighlight( NULL ); ImplDrawMenubutton( this, TRUE ); |