diff options
Diffstat (limited to 'sfx2/inc/sfx2/mnuitem.hxx')
| -rw-r--r-- | sfx2/inc/sfx2/mnuitem.hxx | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx index fe7d8bb36b1e..669f579a254c 100644 --- a/sfx2/inc/sfx2/mnuitem.hxx +++ b/sfx2/inc/sfx2/mnuitem.hxx @@ -50,24 +50,24 @@ class SFX2_DLLPUBLIC SfxMenuControl: public SfxControllerItem String aHelpText; SfxVirtualMenu* pOwnMenu; SfxVirtualMenu* pSubMenu; - BOOL b_ShowStrings; - BOOL b_UnusedDummy; + sal_Bool b_ShowStrings; + sal_Bool b_UnusedDummy; public: SfxMenuControl(); - SfxMenuControl( BOOL bShowStrings ); - SfxMenuControl( USHORT, SfxBindings&); + SfxMenuControl( sal_Bool bShowStrings ); + SfxMenuControl( sal_uInt16, SfxBindings&); - static SfxMenuControl* CreateImpl( USHORT nId, Menu &rMenu, SfxBindings &rBindings ); - static void RegisterControl( USHORT nSlotId = 0, SfxModule *pMod=NULL ); + static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ); + static void RegisterControl( sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL ); ~SfxMenuControl(); using SfxControllerItem::Bind; - void Bind( SfxVirtualMenu* pOwnMenu, USHORT nId, + void Bind( SfxVirtualMenu* pOwnMenu, sal_uInt16 nId, const String& rTitle, const String &rHelpText, SfxBindings & ); - void Bind( SfxVirtualMenu* pOwnMenu, USHORT nId, + void Bind( SfxVirtualMenu* pOwnMenu, sal_uInt16 nId, SfxVirtualMenu& rSubMenu, const String& rTitle, const String &rHelpText, SfxBindings & ); @@ -84,13 +84,13 @@ public: const String& GetHelpText() const { return aHelpText; } void SetHelpText(const String &rStr) { aHelpText = rStr; } - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - static SfxMenuControl* CreateControl( USHORT nId, Menu &, SfxBindings & ); - static SfxUnoMenuControl* CreateControl( const String&, USHORT, Menu&, SfxBindings&, SfxVirtualMenu* ); - static SfxUnoMenuControl* CreateControl( const String&, USHORT, Menu&, const String& sItemText, const String& sHelpText, SfxBindings&, SfxVirtualMenu* ); - static BOOL IsSpecialControl( USHORT nId, SfxModule* ); + static SfxMenuControl* CreateControl( sal_uInt16 nId, Menu &, SfxBindings & ); + static SfxUnoMenuControl* CreateControl( const String&, sal_uInt16, Menu&, SfxBindings&, SfxVirtualMenu* ); + static SfxUnoMenuControl* CreateControl( const String&, sal_uInt16, Menu&, const String& sItemText, const String& sHelpText, SfxBindings&, SfxVirtualMenu* ); + static sal_Bool IsSpecialControl( sal_uInt16 nId, SfxModule* ); static void RegisterMenuControl(SfxModule*, SfxMenuCtrlFactory*); }; @@ -99,9 +99,9 @@ class SfxUnoMenuControl : public SfxMenuControl { SfxUnoControllerItem* pUnoCtrl; public: - SfxUnoMenuControl( const String&, USHORT nId, Menu&, + SfxUnoMenuControl( const String&, sal_uInt16 nId, Menu&, SfxBindings&, SfxVirtualMenu* ); - SfxUnoMenuControl( const String&, USHORT nId, Menu&, + SfxUnoMenuControl( const String&, sal_uInt16 nId, Menu&, const String&, const String&, SfxBindings&, SfxVirtualMenu* ); ~SfxUnoMenuControl(); @@ -110,16 +110,16 @@ public: //-------------------------------------------------------------------- -typedef SfxMenuControl* (*SfxMenuControlCtor)( USHORT nId, Menu &, SfxBindings & ); +typedef SfxMenuControl* (*SfxMenuControlCtor)( sal_uInt16 nId, Menu &, SfxBindings & ); struct SfxMenuCtrlFactory { SfxMenuControlCtor pCtor; TypeId nTypeId; - USHORT nSlotId; + sal_uInt16 nSlotId; SfxMenuCtrlFactory( SfxMenuControlCtor pTheCtor, - TypeId nTheTypeId, USHORT nTheSlotId ): + TypeId nTheTypeId, sal_uInt16 nTheSlotId ): pCtor(pTheCtor), nTypeId(nTheTypeId), nSlotId(nTheSlotId) @@ -143,13 +143,13 @@ inline SfxVirtualMenu* SfxMenuControl::GetPopupMenu() const //-------------------------------------------------------------------- #define SFX_DECL_MENU_CONTROL() \ - static SfxMenuControl* CreateImpl( USHORT nId, Menu &rMenu, SfxBindings &rBindings ); \ - static void RegisterControl(USHORT nSlotId = 0, SfxModule *pMod=NULL) + static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ); \ + static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL) #define SFX_IMPL_MENU_CONTROL(Class, nItemClass) \ - SfxMenuControl* __EXPORT Class::CreateImpl( USHORT nId, Menu &rMenu, SfxBindings &rBindings ) \ + SfxMenuControl* __EXPORT Class::CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ) \ { return new Class(nId, rMenu, rBindings); } \ - void Class::RegisterControl(USHORT nSlotId, SfxModule *pMod) \ + void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \ { SfxMenuControl::RegisterMenuControl( pMod, new SfxMenuCtrlFactory( \ Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); } @@ -158,16 +158,16 @@ inline SfxVirtualMenu* SfxMenuControl::GetPopupMenu() const class SfxAppMenuControl_Impl : public SfxMenuControl { PopupMenu* pMenu; - ULONG m_nSymbolsStyle; - BOOL m_bWasHiContrastMode; - BOOL m_bShowMenuImages; + sal_uIntPtr m_nSymbolsStyle; + sal_Bool m_bWasHiContrastMode; + sal_Bool m_bShowMenuImages; protected: DECL_LINK( Activate, Menu * ); // Needed to support high contrast images public: SFX_DECL_MENU_CONTROL(); - SfxAppMenuControl_Impl( USHORT nPos, Menu& rMenu, SfxBindings& rBindings ); + SfxAppMenuControl_Impl( sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings ); ~SfxAppMenuControl_Impl(); }; |