diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 09:43:18 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 09:43:18 +0000 |
| commit | ec5a0e66b6e285e20c54fc26d007b7eb6480f11f (patch) | |
| tree | a7a83864a95a424163ce2a2d745bb84d70b1465e /framework/source/uielement | |
| parent | fa890c6404a55b0075a69f4ef0d800132350539d (diff) | |
INTEGRATION: CWS sb59 (1.37.12); FILE MERGED
2006/08/18 18:21:42 sb 1.37.12.2: RESYNC: (1.37-1.39); FILE MERGED
2006/08/10 08:16:25 sb 1.37.12.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'framework/source/uielement')
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index b07c5055837c..be6e15d30d0a 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -4,9 +4,9 @@ * * $RCSfile: menubarmanager.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: obo $ $Date: 2006-09-16 14:22:05 $ + * last change: $Author: obo $ $Date: 2006-10-12 10:43:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -338,8 +338,8 @@ MenuBarManager::MenuBarManager( Reference< XStatusListener > xStatusListener; Reference< XDispatch > xDispatch; - int nItemCount = pAddonMenu->GetItemCount(); - for ( int i = 0; i < nItemCount; i++ ) + USHORT nItemCount = pAddonMenu->GetItemCount(); + for ( USHORT i = 0; i < nItemCount; i++ ) { USHORT nItemId = pAddonMenu->GetItemId( i ); @@ -425,8 +425,8 @@ MenuBarManager::MenuBarManager( Reference< XDispatch > xDispatch; Reference< XStatusListener > xStatusListener; - int nItemCount = pAddonPopupMenu->GetItemCount(); - for ( int i = 0; i < nItemCount; i++ ) + USHORT nItemCount = pAddonPopupMenu->GetItemCount(); + for ( USHORT i = 0; i < nItemCount; i++ ) { USHORT nItemId = pAddonPopupMenu->GetItemId( i ); @@ -1601,8 +1601,8 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, Reference< XFrame >& rFrame, String aEmpty; sal_Bool bAccessibilityEnabled( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() ); - int nItemCount = pMenu->GetItemCount(); - for ( int i = 0; i < nItemCount; i++ ) + USHORT nItemCount = pMenu->GetItemCount(); + for ( USHORT i = 0; i < nItemCount; i++ ) { USHORT nItemId = pMenu->GetItemId( i ); |