summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-10-06 09:35:21 +0000
committerKurt Zenker <kz@openoffice.org>2006-10-06 09:35:21 +0000
commit7a1ea2845e549909d197876c75c2cc82e5069b0e (patch)
tree5258fae51363f2465ffb0dc58d71a1eab3801e0d /vcl
parentc87470035691e1cfcf45d5031d894dfefa34c9b8 (diff)
INTEGRATION: CWS onlineupdate4 (1.141.14); FILE MERGED
2006/10/04 07:40:33 dv 1.141.14.2: RESYNC: (1.141-1.142); FILE MERGED 2006/08/16 14:13:00 dv 1.141.14.1: #i68667# Use ItemPos instead of id to remove item
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/menu.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 77204712c3fa..d63c0af3580e 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: menu.cxx,v $
*
- * $Revision: 1.142 $
+ * $Revision: 1.143 $
*
- * last change: $Author: obo $ $Date: 2006-09-17 12:19:43 $
+ * last change: $Author: kz $ $Date: 2006-10-06 10:35:20 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -5661,7 +5661,8 @@ Rectangle MenuBarWindow::GetMenuBarButtonRectPixel( USHORT nId )
void MenuBarWindow::RemoveMenuBarButton( USHORT nId )
{
- aCloser.RemoveItem( nId );
+ USHORT nPos = aCloser.GetItemPos( nId );
+ aCloser.RemoveItem( nPos );
m_aAddButtons.erase( nId );
aCloser.calcMinSize();
ImplLayoutChanged();