summaryrefslogtreecommitdiff
path: root/framework/source/classes
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2006-10-12 09:39:55 +0000
committerOliver Bolte <obo@openoffice.org>2006-10-12 09:39:55 +0000
commit629fed374894e768ec43551e005cdc300bec1d70 (patch)
tree4679a38cf86aaee3e549744078e63499977afafe /framework/source/classes
parent08265290b14f528ab2c7495a374b269ba8019787 (diff)
INTEGRATION: CWS sb59 (1.38.46); FILE MERGED
2006/08/10 08:16:20 sb 1.38.46.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'framework/source/classes')
-rw-r--r--framework/source/classes/menumanager.cxx20
1 files changed, 10 insertions, 10 deletions
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index a87c9d63d4ef..cf67bf809bac 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: menumanager.cxx,v $
*
- * $Revision: 1.39 $
+ * $Revision: 1.40 $
*
- * last change: $Author: obo $ $Date: 2006-09-16 13:48:25 $
+ * last change: $Author: obo $ $Date: 2006-10-12 10:39:55 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -240,8 +240,8 @@ MenuManager::MenuManager(
sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength();
::std::vector< USHORT > aQueryLabelItemIdVector;
- 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 );
@@ -501,8 +501,8 @@ MenuManager::MenuManager(
SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)this )->acquire();
- int nItemCount = pBmkMenu->GetItemCount();
- for ( int i = 0; i < nItemCount; i++ )
+ USHORT nItemCount = pBmkMenu->GetItemCount();
+ for ( USHORT i = 0; i < nItemCount; i++ )
{
USHORT nItemId = pBmkMenu->GetItemId( i );
@@ -579,8 +579,8 @@ MenuManager::MenuManager(
SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)this )->acquire();
- 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 );
@@ -657,8 +657,8 @@ MenuManager::MenuManager(
SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)this )->acquire();
- 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 );