diff options
Diffstat (limited to 'sfx2/source/menu/objmnctl.cxx')
| -rw-r--r-- | sfx2/source/menu/objmnctl.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sfx2/source/menu/objmnctl.cxx b/sfx2/source/menu/objmnctl.cxx index e9d609151504..639669ab90c3 100644 --- a/sfx2/source/menu/objmnctl.cxx +++ b/sfx2/source/menu/objmnctl.cxx @@ -59,7 +59,7 @@ using namespace com::sun::star; in seinen Parent ein. */ -SfxObjectVerbsControl::SfxObjectVerbsControl(USHORT nSlotId, Menu &rMenu, SfxBindings &rBindings) +SfxObjectVerbsControl::SfxObjectVerbsControl(sal_uInt16 nSlotId, Menu &rMenu, SfxBindings &rBindings) : SfxMenuControl( nSlotId, rBindings ) , pMenu(new PopupMenu) , rParent(rMenu) @@ -85,8 +85,8 @@ void SfxObjectVerbsControl::FillMenu() const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& aVerbs = pView->GetVerbs(); if ( aVerbs.getLength() ) { - USHORT nSlotId = SID_VERB_START; - for (USHORT n=0; n<aVerbs.getLength(); n++) + sal_uInt16 nSlotId = SID_VERB_START; + for (sal_uInt16 n=0; n<aVerbs.getLength(); n++) { // check for ReadOnly verbs if ( pDoc->IsReadOnly() && !(aVerbs[n].VerbAttributes & embed::VerbAttributes::MS_VERBATTR_NEVERDIRTIES) ) @@ -105,7 +105,7 @@ void SfxObjectVerbsControl::FillMenu() } } - rParent.EnableItem( GetId(), (BOOL)pMenu->GetItemCount() ); + rParent.EnableItem( GetId(), (sal_Bool)pMenu->GetItemCount() ); } //-------------------------------------------------------------------- @@ -119,7 +119,7 @@ void SfxObjectVerbsControl::FillMenu() */ void SfxObjectVerbsControl::StateChanged( - USHORT /*nSID*/, + sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* /*pState*/ ) { @@ -137,7 +137,7 @@ void SfxObjectVerbsControl::StateChanged( IMPL_LINK_INLINE_START( SfxObjectVerbsControl, MenuSelect, Menu *, pSelMenu ) { - const USHORT nSlotId = pSelMenu->GetCurItemId(); + const sal_uInt16 nSlotId = pSelMenu->GetCurItemId(); if( nSlotId ) GetBindings().Execute(nSlotId); return 1; |