diff options
Diffstat (limited to 'sw/source/ui/utlui/tmplctrl.cxx')
| -rw-r--r-- | sw/source/ui/utlui/tmplctrl.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/ui/utlui/tmplctrl.cxx b/sw/source/ui/utlui/tmplctrl.cxx index df78a355d8c8..bcae8fa9cd24 100644 --- a/sw/source/ui/utlui/tmplctrl.cxx +++ b/sw/source/ui/utlui/tmplctrl.cxx @@ -61,10 +61,10 @@ class TemplatePopup_Impl : public PopupMenu public: TemplatePopup_Impl(); - USHORT GetCurId() const { return nCurId; } + sal_uInt16 GetCurId() const { return nCurId; } private: - USHORT nCurId; + sal_uInt16 nCurId; virtual void Select(); }; @@ -86,8 +86,8 @@ void TemplatePopup_Impl::Select() // class SvxZoomStatusBarControl ------------------------------------------ -SwTemplateControl::SwTemplateControl( USHORT _nSlotId, - USHORT _nId, +SwTemplateControl::SwTemplateControl( sal_uInt16 _nSlotId, + sal_uInt16 _nId, StatusBar& rStb ) : SfxStatusBarControl( _nSlotId, _nId, rStb ) { @@ -102,7 +102,7 @@ SwTemplateControl::~SwTemplateControl() // ----------------------------------------------------------------------- void SwTemplateControl::StateChanged( - USHORT /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) + sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) { if( eState != SFX_ITEM_AVAILABLE || pState->ISA( SfxVoidItem ) ) GetStatusBar().SetItemText( GetId(), String() ); @@ -142,7 +142,7 @@ void SwTemplateControl::Command( const CommandEvent& rCEvt ) pPool->SetSearchMask(SFX_STYLE_FAMILY_PAGE, SFXSTYLEBIT_ALL); if( pPool->Count() > 1 ) { - USHORT nCount = 0; + sal_uInt16 nCount = 0; SfxStyleSheetBase* pStyle = pPool->First(); while( pStyle ) { @@ -152,7 +152,7 @@ void SwTemplateControl::Command( const CommandEvent& rCEvt ) } aPop.Execute( &GetStatusBar(), rCEvt.GetMousePosPixel()); - USHORT nCurrId = aPop.GetCurId(); + sal_uInt16 nCurrId = aPop.GetCurId(); if( nCurrId != USHRT_MAX) { // sieht etwas umstaendlich aus, anders geht's aber nicht |