summaryrefslogtreecommitdiffstats
path: root/dbaccess/source/ui/app/AppControllerGen.cxx
diff options
context:
space:
mode:
authorFrank Schoenheit [fs] <frank.schoenheit@oracle.com>2011-02-14 22:22:46 +0100
committerFrank Schoenheit [fs] <frank.schoenheit@oracle.com>2011-02-14 22:22:46 +0100
commitac6e971d8a5f715f716b6bdcaf6cb535104df32c (patch)
tree940128ed8521d861e77603621700cae8104e6ac3 /dbaccess/source/ui/app/AppControllerGen.cxx
parentmerge from master (diff)
parentCWS-TOOLING: integrate CWS hr75 (diff)
downloadcore-ac6e971d8a5f715f716b6bdcaf6cb535104df32c.tar.gz
core-ac6e971d8a5f715f716b6bdcaf6cb535104df32c.zip
dba34c: pulled and merged 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 6e31a23ec997..f7fb899388c6 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -762,8 +762,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