diff options
| author | Mikhail Voytenko <mav@openoffice.org> | 2011-01-10 16:07:18 +0100 |
|---|---|---|
| committer | Mikhail Voytenko <mav@openoffice.org> | 2011-01-10 16:07:18 +0100 |
| commit | 3f4e9b4c3cd9028744ea6ed5e93c41c51a15d229 (patch) | |
| tree | 65f4fe38cd7c7ba5805435393b299eb0b8ff31c6 /sfx2/source/menu | |
| parent | 61a8280d645fe1b6957591d5d338d073040e8b2e (diff) | |
removetooltypes01: #i112600# remove tooltypes from sfx2
Diffstat (limited to 'sfx2/source/menu')
| -rwxr-xr-x | sfx2/source/menu/thessubmenu.cxx | 8 | ||||
| -rw-r--r-- | sfx2/source/menu/thessubmenu.hxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sfx2/source/menu/thessubmenu.cxx b/sfx2/source/menu/thessubmenu.cxx index d82c0a6dbdf3..501d3e35f326 100755 --- a/sfx2/source/menu/thessubmenu.cxx +++ b/sfx2/source/menu/thessubmenu.cxx @@ -66,7 +66,7 @@ SFX_IMPL_MENU_CONTROL(SfxThesSubMenuControl, SfxStringItem); Ctor; setzt Select-Handler am Menu und traegt Menu in seinen Parent ein. */ -SfxThesSubMenuControl::SfxThesSubMenuControl( USHORT nSlotId, Menu &rMenu, SfxBindings &rBindings ) +SfxThesSubMenuControl::SfxThesSubMenuControl( sal_uInt16 nSlotId, Menu &rMenu, SfxBindings &rBindings ) : SfxMenuControl( nSlotId, rBindings ), pMenu(new PopupMenu), rParent(rMenu) @@ -74,7 +74,7 @@ SfxThesSubMenuControl::SfxThesSubMenuControl( USHORT nSlotId, Menu &rMenu, SfxBi rMenu.SetPopupMenu(nSlotId, pMenu); pMenu->SetSelectHdl(LINK(this, SfxThesSubMenuControl, MenuSelect)); pMenu->Clear(); - rParent.EnableItem( GetId(), FALSE ); + rParent.EnableItem( GetId(), sal_False ); } @@ -90,7 +90,7 @@ SfxThesSubMenuControl::~SfxThesSubMenuControl() Menueeintrag im Parentmenu disabled, andernfalls wird er enabled. */ void SfxThesSubMenuControl::StateChanged( - USHORT /*nSID*/, + sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* /*pState*/ ) { @@ -104,7 +104,7 @@ void SfxThesSubMenuControl::StateChanged( */ IMPL_LINK_INLINE_START( SfxThesSubMenuControl, MenuSelect, Menu *, pSelMenu ) { - const USHORT nSlotId = pSelMenu->GetCurItemId(); + const sal_uInt16 nSlotId = pSelMenu->GetCurItemId(); if( nSlotId ) GetBindings().Execute(nSlotId); return 1; diff --git a/sfx2/source/menu/thessubmenu.hxx b/sfx2/source/menu/thessubmenu.hxx index 0b86a534de52..394c22b6e497 100644 --- a/sfx2/source/menu/thessubmenu.hxx +++ b/sfx2/source/menu/thessubmenu.hxx @@ -52,11 +52,11 @@ class SfxThesSubMenuControl : public SfxMenuControl Menu& rParent; private: - virtual void StateChanged( USHORT, SfxItemState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState ); DECL_LINK( MenuSelect, Menu * ); public: - SfxThesSubMenuControl(USHORT, Menu&, SfxBindings&); + SfxThesSubMenuControl(sal_uInt16, Menu&, SfxBindings&); ~SfxThesSubMenuControl(); virtual PopupMenu* GetPopup() const; |