diff options
Diffstat (limited to 'framework/inc/uielement/menubarmanager.hxx')
| -rw-r--r-- | framework/inc/uielement/menubarmanager.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index f201c70d7bb0..64f8667924d7 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -163,11 +163,11 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener Menu* GetMenuBar() const { return m_pVCLMenu; } // Configuration methods - static void FillMenuWithConfiguration( USHORT& nId, Menu* pMenu, + static void FillMenuWithConfiguration( sal_uInt16& nId, Menu* pMenu, const ::rtl::OUString& rModuleIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& rTransformer ); - static void FillMenu( USHORT& nId, + static void FillMenu( sal_uInt16& nId, Menu* pMenu, const ::rtl::OUString& rModuleIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer, @@ -202,7 +202,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener struct MenuItemHandler { - MenuItemHandler( USHORT aItemId, + MenuItemHandler( sal_uInt16 aItemId, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xManager, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) : nItemId( aItemId ), @@ -210,7 +210,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener xSubMenuManager( xManager ), xMenuItemDispatch( rDispatch ) {} - USHORT nItemId; + sal_uInt16 nItemId; sal_Bool bCheckHide; ::rtl::OUString aTargetFrame; ::rtl::OUString aMenuItemURL; @@ -234,10 +234,10 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener std::vector< MenuItemHandler* >& aMenuShortCuts ); static void MergeAddonMenus( Menu* pMenuBar, const MergeMenuInstructionContainer&, const ::rtl::OUString& aModuleIdentifier ); - MenuItemHandler* GetMenuItemHandler( USHORT nItemId ); + MenuItemHandler* GetMenuItemHandler( sal_uInt16 nItemId ); sal_Bool CreatePopupMenuController( MenuItemHandler* pMenuItemHandler ); - void AddMenu(MenuBarManager* pSubMenuManager,const ::rtl::OUString& _sItemCommand,USHORT _nItemId); - USHORT FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,USHORT _nIndex) const; + void AddMenu(MenuBarManager* pSubMenuManager,const ::rtl::OUString& _sItemCommand,sal_uInt16 _nItemId); + sal_uInt16 FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,sal_uInt16 _nIndex) const; void Init(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,AddonMenu* pAddonMenu,sal_Bool bDelete,sal_Bool bDeleteChildren,bool _bHandlePopUp = false); void SetHdl(); |