diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-02 14:12:55 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-02 14:12:55 +0000 |
| commit | 1d05c026a921ab7df7771e53c2cab993f63e9915 (patch) | |
| tree | 3c958f627efdd740ee75c037ccc5c74371e69ea9 /framework | |
| parent | a64a90f48ed490e3665761af505511692eee3ded (diff) | |
INTEGRATION: CWS docking2 (1.7.12); FILE MERGED
2004/07/20 09:50:54 cd 1.7.12.1: #i29739# Use sal_Int32 to retrieve value from sequence. We use a unsigned short value for help IDs!
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index c6a657ed58f3..c5702c67c742 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -2,9 +2,9 @@ * * $RCSfile: menubarmanager.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: kz $ $Date: 2004-08-02 13:16:38 $ + * last change: $Author: hr $ $Date: 2004-08-02 15:12:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1910,9 +1910,9 @@ void MenuBarManager::FillMenu( USHORT& nId, Menu* pMenu, const Reference< XIndex pMenu->InsertItem( nId, aLabel ); pMenu->SetItemCommand( nId, aCommandURL ); - sal_Int16 nHelpId = (sal_Int16)aHelpURL.toInt32(); + sal_Int32 nHelpId = aHelpURL.toInt32(); if ( nHelpId > 0 ) - pMenu->SetHelpId( nId, nHelpId ); + pMenu->SetHelpId( nId, (USHORT)nHelpId ); if ( xIndexContainer.is() ) { |