summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/app/AppControllerGen.cxx
diff options
context:
space:
mode:
authorIngrid Halama [iha] <Ingrid.Halama@oracle.com>2011-02-15 13:28:01 +0100
committerIngrid Halama [iha] <Ingrid.Halama@oracle.com>2011-02-15 13:28:01 +0100
commit8b35f0adebc482200cc5ff6622f81c9cc4067035 (patch)
tree3db8f52e1af776a06fe97549877caa0ace10e406 /dbaccess/source/ui/app/AppControllerGen.cxx
parentf720ab73332799d3a19fd5f077ca05c93c0ebcf7 (diff)
parentb1708ffb49872b51c2b7d82380efeb1282d73b1c (diff)
chart52: merge with DEV300_m100
Diffstat (limited to 'dbaccess/source/ui/app/AppControllerGen.cxx')
-rw-r--r--dbaccess/source/ui/app/AppControllerGen.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index 9965f00dbd21..e6159a204d2a 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -763,8 +763,8 @@ void OApplicationController::onLoadedMenu(const Reference< ::com::sun::star::fra
MenuBar* pMenu = pSystemWindow ? pSystemWindow->GetMenuBar() : NULL;
if ( pMenu )
{
- USHORT nMenuItems = pMenu->GetItemCount();
- for ( USHORT i = 0; i < nMenuItems; ++i )
+ sal_uInt16 nMenuItems = pMenu->GetItemCount();
+ for ( sal_uInt16 i = 0; i < nMenuItems; ++i )
aMnemonicGenerator.RegisterMnemonic( pMenu->GetItemText( pMenu->GetItemId( i ) ) );
}
// - the icons should use automatic ones