1 files changed, 14 insertions, 14 deletions

diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/ui/inc/workctrl.hxx
index f6a6b19c3c73..297c343a7391 100644
--- a/sw/source/ui/inc/workctrl.hxx
+++ b/sw/source/ui/inc/workctrl.hxx
@@ -70,20 +70,20 @@ class SwView;
 
 class SwTbxInsertCtrl : public SfxToolBoxControl
 {
-    USHORT                  nLastSlotId;
+    sal_uInt16                  nLastSlotId;
 
     using SfxToolBoxControl::Select;
-    virtual void            Select( BOOL bMod1 = FALSE );
+    virtual void            Select( sal_Bool bMod1 = sal_False );
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SwTbxInsertCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SwTbxInsertCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SwTbxInsertCtrl();
 
     virtual SfxPopupWindowType  GetPopupWindowType() const;
     virtual SfxPopupWindow*     CreatePopupWindow();
-    virtual void                StateChanged( USHORT nSID,
+    virtual void                StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
                                               const SfxPoolItem* pState );
 
@@ -104,12 +104,12 @@ class SwTbxAutoTextCtrl : public SfxToolBoxControl
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SwTbxAutoTextCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SwTbxAutoTextCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SwTbxAutoTextCtrl();
 
     virtual SfxPopupWindowType  GetPopupWindowType() const;
     virtual SfxPopupWindow*     CreatePopupWindow();
-    virtual void                StateChanged( USHORT nSID,
+    virtual void                StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
                                               const SfxPoolItem* pState );
 
@@ -141,8 +141,8 @@ class SwScrollNaviPopup : public SfxPopupWindow
 
     String          sQuickHelp[2 * NID_COUNT];
 
-    USHORT          nFwdId;
-    USHORT          nBackId;
+    sal_uInt16          nFwdId;
+    sal_uInt16          nBackId;
 
     void            ApplyImageList();
 
@@ -153,10 +153,10 @@ protected:
         virtual void        DataChanged( const DataChangedEvent& rDCEvt );
 
 public:
-        SwScrollNaviPopup( USHORT nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
+        SwScrollNaviPopup( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
         ~SwScrollNaviPopup();
 
-    static String           GetQuickHelpText(BOOL bNext);
+    static String           GetQuickHelpText(sal_Bool bNext);
 
     virtual SfxPopupWindow* Clone() const;
     void                GrabFocus(){aToolBox.GrabFocus();}
@@ -194,9 +194,9 @@ class SwNaviImageButton : public ImageButton
 
 class SwHlpImageButton : public ImageButton
 {
-    BOOL        bUp;
+    sal_Bool        bUp;
     public:
-        SwHlpImageButton(Window* pParent, const ResId& rResId, BOOL bUpBtn) :
+        SwHlpImageButton(Window* pParent, const ResId& rResId, sal_Bool bUpBtn) :
             ImageButton(pParent, rResId), bUp(bUpBtn){}
 
     virtual void    RequestHelp( const HelpEvent& rHEvt );
@@ -210,10 +210,10 @@ class SwPreviewZoomControl : public SfxToolBoxControl
 public:
     SFX_DECL_TOOLBOX_CONTROL();
 
-    SwPreviewZoomControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    SwPreviewZoomControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
     ~SwPreviewZoomControl();
 
-    virtual void            StateChanged( USHORT nSID,
+    virtual void            StateChanged( sal_uInt16 nSID,
                                               SfxItemState eState,
                                               const SfxPoolItem* pState );