diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 09:43:32 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 09:43:32 +0000 |
| commit | 6d6a0a194ee75d46ebd344d4f1f3406b6f9155b9 (patch) | |
| tree | 7cc49c0956cf7f536350d4f48f11c55e635746e7 /framework/source/uielement/newmenucontroller.cxx | |
| parent | ec5a0e66b6e285e20c54fc26d007b7eb6480f11f (diff) | |
INTEGRATION: CWS sb59 (1.7.46); FILE MERGED
2006/08/10 08:16:25 sb 1.7.46.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'framework/source/uielement/newmenucontroller.cxx')
| -rw-r--r-- | framework/source/uielement/newmenucontroller.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index b578320cc01c..9625d2a810c8 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -4,9 +4,9 @@ * * $RCSfile: newmenucontroller.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: obo $ $Date: 2006-09-16 14:22:34 $ + * last change: $Author: obo $ $Date: 2006-10-12 10:43:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -155,11 +155,11 @@ DEFINE_INIT_SERVICE ( NewMenuController, {} ) void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImages, sal_Bool bHiContrast ) { - int nItemCount = pPopupMenu->GetItemCount(); + USHORT nItemCount = pPopupMenu->GetItemCount(); Image aImage; Reference< XFrame > xFrame( m_xFrame ); - for ( int i = 0; i < nItemCount; i++ ) + for ( USHORT i = 0; i < nItemCount; i++ ) { USHORT nItemId = pPopupMenu->GetItemId( i ); if ( nItemId != 0 ) @@ -431,7 +431,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup // retrieve additional parameters from bookmark menu and // store it in a hash_map. - for ( int i = 0; i < pSubMenu->GetItemCount(); i++ ) + for ( USHORT i = 0; i < pSubMenu->GetItemCount(); i++ ) { USHORT nItemId = pSubMenu->GetItemId( i ); if (( nItemId != 0 ) && |