diff options
Diffstat (limited to 'sfx2/inc/sfx2/objface.hxx')
-rw-r--r-- | sfx2/inc/sfx2/objface.hxx | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/sfx2/inc/sfx2/objface.hxx b/sfx2/inc/sfx2/objface.hxx index c7710f533935..4294a93a454c 100644 --- a/sfx2/inc/sfx2/objface.hxx +++ b/sfx2/inc/sfx2/objface.hxx @@ -55,27 +55,27 @@ friend class SfxSlotPool; const char* pName; // Sfx-internal name of interface const SfxInterface* pGenoType; // base interface SfxSlot* pSlots; // SlotMap - USHORT nCount; // number of slots in SlotMap + sal_uInt16 nCount; // number of slots in SlotMap SfxInterfaceId nClassId; // Id of interface ResId aNameResId; // ResId of external interface name SfxInterface_Impl* pImpData; - SfxSlot* operator[]( USHORT nPos ) const; + SfxSlot* operator[]( sal_uInt16 nPos ) const; public: SfxInterface( const char *pClass, const ResId& rResId, SfxInterfaceId nClassId, const SfxInterface* pGeno, - SfxSlot &rMessages, USHORT nMsgCount ); + SfxSlot &rMessages, sal_uInt16 nMsgCount ); virtual ~SfxInterface(); - void SetSlotMap( SfxSlot& rMessages, USHORT nMsgCount ); - inline USHORT Count() const; + void SetSlotMap( SfxSlot& rMessages, sal_uInt16 nMsgCount ); + inline sal_uInt16 Count() const; const SfxSlot* GetRealSlot( const SfxSlot * ) const; - const SfxSlot* GetRealSlot( USHORT nSlotId ) const; - virtual const SfxSlot* GetSlot( USHORT nSlotId ) const; + const SfxSlot* GetRealSlot( sal_uInt16 nSlotId ) const; + virtual const SfxSlot* GetSlot( sal_uInt16 nSlotId ) const; const SfxSlot* GetSlot( const String& rCommand ) const; const char* GetClassName() const { return pName; } @@ -88,21 +88,21 @@ public: const SfxInterface* GetGenoType() const { return pGenoType; } const SfxInterface* GetRealInterfaceForSlot( const SfxSlot* ) const; - void RegisterObjectBar( USHORT, const ResId&, const String* pST=0 ); - void RegisterObjectBar( USHORT, const ResId&, sal_uInt32 nFeature, const String* pST=0 ); - void RegisterChildWindow( USHORT, BOOL bContext, const String* pST=0 ); - void RegisterChildWindow( USHORT, BOOL bContext, sal_uInt32 nFeature, const String* pST=0 ); + void RegisterObjectBar( sal_uInt16, const ResId&, const String* pST=0 ); + void RegisterObjectBar( sal_uInt16, const ResId&, sal_uInt32 nFeature, const String* pST=0 ); + void RegisterChildWindow( sal_uInt16, sal_Bool bContext, const String* pST=0 ); + void RegisterChildWindow( sal_uInt16, sal_Bool bContext, sal_uInt32 nFeature, const String* pST=0 ); void RegisterStatusBar( const ResId& ); - const ResId& GetObjectBarResId( USHORT nNo ) const; - USHORT GetObjectBarPos( USHORT nNo ) const; - sal_uInt32 GetObjectBarFeature( USHORT nNo ) const; - USHORT GetObjectBarCount() const; - void SetObjectBarPos( USHORT nPos, USHORT nId ); - const String* GetObjectBarName( USHORT nNo ) const; - BOOL IsObjectBarVisible( USHORT nNo) const; - sal_uInt32 GetChildWindowFeature( USHORT nNo ) const; - sal_uInt32 GetChildWindowId( USHORT nNo ) const; - USHORT GetChildWindowCount() const; + const ResId& GetObjectBarResId( sal_uInt16 nNo ) const; + sal_uInt16 GetObjectBarPos( sal_uInt16 nNo ) const; + sal_uInt32 GetObjectBarFeature( sal_uInt16 nNo ) const; + sal_uInt16 GetObjectBarCount() const; + void SetObjectBarPos( sal_uInt16 nPos, sal_uInt16 nId ); + const String* GetObjectBarName( sal_uInt16 nNo ) const; + sal_Bool IsObjectBarVisible( sal_uInt16 nNo) const; + sal_uInt32 GetChildWindowFeature( sal_uInt16 nNo ) const; + sal_uInt32 GetChildWindowId( sal_uInt16 nNo ) const; + sal_uInt16 GetChildWindowCount() const; void RegisterPopupMenu( const ResId& ); const ResId& GetPopupMenuResId() const; const ResId& GetStatusBarResId() const; @@ -121,7 +121,7 @@ public: // returns the number of functions in this cluster -inline USHORT SfxInterface::Count() const +inline sal_uInt16 SfxInterface::Count() const { return nCount; } @@ -130,7 +130,7 @@ inline USHORT SfxInterface::Count() const // returns a function by position in the array -inline SfxSlot* SfxInterface::operator[]( USHORT nPos ) const +inline SfxSlot* SfxInterface::operator[]( sal_uInt16 nPos ) const { return nPos < nCount? pSlots+nPos: 0; } @@ -139,15 +139,15 @@ inline SfxSlot* SfxInterface::operator[]( USHORT nPos ) const class SfxIFConfig_Impl { friend class SfxInterface; - USHORT nCount; + sal_uInt16 nCount; SfxObjectUIArr_Impl* pObjectBars; public: SfxIFConfig_Impl(); ~SfxIFConfig_Impl(); - BOOL Store(SvStream&); - void RegisterObjectBar( USHORT, const ResId&, sal_uInt32 nFeature, const String* pST=0 ); - USHORT GetType(); + sal_Bool Store(SvStream&); + void RegisterObjectBar( sal_uInt16, const ResId&, sal_uInt32 nFeature, const String* pST=0 ); + sal_uInt16 GetType(); }; //#endif |