diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 09:31:10 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 09:31:10 +0000 |
| commit | d1e2691730707739bb965d1e97158be6f1783c33 (patch) | |
| tree | 319f76265351013ed2a2a89f11761331de7b71dc /toolkit | |
| parent | 68be040ad5fd421a25bbaceeb0a904288ec23624 (diff) | |
INTEGRATION: CWS sb59 (1.9.16); FILE MERGED
2006/07/21 07:59:25 sb 1.9.16.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxmenu.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index 2b7537c06884..27d99a4e0987 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -4,9 +4,9 @@ * * $RCSfile: vclxmenu.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: obo $ $Date: 2006-09-16 12:14:04 $ + * last change: $Author: obo $ $Date: 2006-10-12 10:31:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -229,7 +229,8 @@ void VCLXMenu::removeItem( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun:: sal_Int32 nItemCount = (sal_Int32)mpMenu->GetItemCount(); if ( mpMenu && ( nCount > 0 ) && ( nPos >= 0 ) && ( nPos < nItemCount ) && ( nItemCount > 0 )) { - sal_Int16 nP = Min( (int)(nPos+nCount), (int)nItemCount ); + sal_Int16 nP = sal::static_int_cast< sal_Int16 >( + Min( (int)(nPos+nCount), (int)nItemCount )); while( nP-nPos > 0 ) mpMenu->RemoveItem( --nP ); } |