CWS gnumake3: pull in cws removetooltypes01

73 files changed, 1217 insertions, 1217 deletions

diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index 076e36291ae6..d3c1afdd2efe 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -598,7 +598,7 @@ static void handle_menu_highlighted(::VclMenuEvent const * pEvent)
     try
     {
         Menu* pMenu = pEvent->GetMenu();
-        USHORT nPos = pEvent->GetItemPos();
+        sal_uInt16 nPos = pEvent->GetItemPos();
 
         if( pMenu &&  nPos != 0xFFFF)
         {
diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx
index 5448235998e8..c4fdc54e9064 100644
--- a/vcl/unx/gtk/a11y/atkwindow.cxx
+++ b/vcl/unx/gtk/a11y/atkwindow.cxx
@@ -78,7 +78,7 @@ init_from_window( AtkObject *accessible, Window *pWindow )
          */
         case AccessibleRole::WINDOW:
         {
-            USHORT type = WINDOW_WINDOW;
+            sal_uInt16 type = WINDOW_WINDOW;
             bool parentIsMenuFloatingWindow = false;
 
             Window *pParent = pWindow->GetParent();
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index f308822df147..36d475b8795b 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -527,7 +527,7 @@ public:
                             YieldFunc   handle );
     virtual void    Remove( int fd );
 
-    virtual void    StartTimer( ULONG nMS );
+    virtual void    StartTimer( sal_uLong nMS );
     virtual void    StopTimer();
     virtual void    Wakeup();
     virtual void    PostUserEvent();
@@ -727,7 +727,7 @@ gboolean GtkXLib::timeoutFn(gpointer data)
     return FALSE;
 }
 
-void GtkXLib::StartTimer( ULONG nMS )
+void GtkXLib::StartTimer( sal_uLong nMS )
 {
     m_nTimeoutMS = nMS; // for restarting
 
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index 2cb92ecd8292..2b0e90dc9bc0 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -65,7 +65,7 @@ void GtkHookedYieldMutex::ThreadsEnter()
     acquire();
     if( !aYieldStack.empty() )
     { /* Previously called ThreadsLeave() */
-        ULONG nCount = aYieldStack.front();
+        sal_uLong nCount = aYieldStack.front();
         aYieldStack.pop_front();
         while( nCount-- > 1 )
             acquire();
@@ -188,19 +188,19 @@ GtkInstance::~GtkInstance()
     DeInitAtkBridge();
 }
 
-SalFrame* GtkInstance::CreateFrame( SalFrame* pParent, ULONG nStyle )
+SalFrame* GtkInstance::CreateFrame( SalFrame* pParent, sal_uLong nStyle )
 {
     return new GtkSalFrame( pParent, nStyle );
 }
 
-SalFrame* GtkInstance::CreateChildFrame( SystemParentData* pParentData, ULONG )
+SalFrame* GtkInstance::CreateChildFrame( SystemParentData* pParentData, sal_uLong )
 {
     SalFrame* pFrame = new GtkSalFrame( pParentData );
 
     return pFrame;
 }
 
-SalObject* GtkInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow )
+SalObject* GtkInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow )
 {
     // there is no method to set a visual for a GtkWidget
     // so we need the X11SalObject in that case
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index ff615f5ede74..34a7cfcd196b 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -48,11 +48,11 @@
 typedef struct _cairo_font_options cairo_font_options_t;
 
 // initialize statics
-BOOL GtkSalGraphics::bThemeChanged = TRUE;
-BOOL GtkSalGraphics::bNeedPixmapPaint = FALSE;
-BOOL GtkSalGraphics::bGlobalNeedPixmapPaint = FALSE;
-BOOL GtkSalGraphics::bToolbarGripWorkaround = FALSE;
-BOOL GtkSalGraphics::bNeedButtonStyleAsEditBackgroundWorkaround = FALSE;
+sal_Bool GtkSalGraphics::bThemeChanged = sal_True;
+sal_Bool GtkSalGraphics::bNeedPixmapPaint = sal_False;
+sal_Bool GtkSalGraphics::bGlobalNeedPixmapPaint = sal_False;
+sal_Bool GtkSalGraphics::bToolbarGripWorkaround = sal_False;
+sal_Bool GtkSalGraphics::bNeedButtonStyleAsEditBackgroundWorkaround = sal_False;
 
 GtkSalGraphics::~GtkSalGraphics()
 {
@@ -269,7 +269,7 @@ public:
         { delete [] pData; m_idx = 0; m_size = n; pData = new NWPixmapCacheData[m_size]; }
     int GetSize() { return m_size; }
 
-    BOOL Find( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkPixmap** pPixmap );
+    sal_Bool Find( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkPixmap** pPixmap );
     void Fill( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkPixmap* pPixmap );
 
     void ThemeChanged();
@@ -322,7 +322,7 @@ void NWPixmapCache::ThemeChanged()
         pData[i].SetPixmap( NULL );
 }
 
-BOOL  NWPixmapCache::Find( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkPixmap** pPixmap )
+sal_Bool  NWPixmapCache::Find( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkPixmap** pPixmap )
 {
     aState &= ~CTRL_CACHING_ALLOWED; // mask clipping flag
     int i;
@@ -335,10 +335,10 @@ BOOL  NWPixmapCache::Find( ControlType aType, ControlState aState, const Rectang
             pData[i].m_pixmap != NULL )
         {
             *pPixmap = pData[i].m_pixmap;
-            return TRUE;
+            return sal_True;
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
 void NWPixmapCache::Fill( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkPixmap* pPixmap )
@@ -479,13 +479,13 @@ void GtkSalGraphics::ResetClipRegion()
     X11SalGraphics::ResetClipRegion();
 }
 
-void GtkSalGraphics::BeginSetClipRegion( ULONG nCount )
+void GtkSalGraphics::BeginSetClipRegion( sal_uLong nCount )
 {
     m_aClipRegion.SetNull();
     X11SalGraphics::BeginSetClipRegion( nCount );
 }
 
-BOOL GtkSalGraphics::unionClipRegion( long nX, long nY, long nWidth, long nHeight )
+sal_Bool GtkSalGraphics::unionClipRegion( long nX, long nY, long nWidth, long nHeight )
 {
     Rectangle aRect( Point( nX, nY ), Size( nWidth, nHeight ) );
     m_aClipRegion.Union( aRect );
@@ -533,10 +533,10 @@ void GtkSalGraphics::copyBits( const SalTwoRect* pPosAry,
 /*
  * IsNativeControlSupported()
  *
- *  Returns TRUE if the platform supports native
+ *  Returns sal_True if the platform supports native
  *  drawing of the control defined by nPart
  */
-BOOL GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart )
+sal_Bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart )
 {
     if (
         ((nType==CTRL_PUSHBUTTON)  && (nPart==PART_ENTIRE_CONTROL))     ||
@@ -603,26 +603,26 @@ BOOL GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP
                 )
         )
         )
-        return( TRUE );
+        return( sal_True );
 
-    return( FALSE );
+    return( sal_False );
 }
 
 
 /*
  * HitTestNativeControl()
  *
- *  bIsInside is set to TRUE if aPos is contained within the
+ *  bIsInside is set to sal_True if aPos is contained within the
  *  given part of the control, whose bounding region is
  *  given by rControlRegion (in VCL frame coordinates).
  *
  *  returns whether bIsInside was really set.
  */
-BOOL GtkSalGraphics::hitTestNativeControl( ControlType      nType,
+sal_Bool GtkSalGraphics::hitTestNativeControl( ControlType      nType,
                                 ControlPart     nPart,
                                 const Rectangle&        rControlRegion,
                                 const Point&        aPos,
-                                BOOL&           rIsInside )
+                                sal_Bool&           rIsInside )
 {
     if ( ( nType == CTRL_SCROLLBAR ) &&
          ( ( nPart == PART_BUTTON_UP ) ||
@@ -645,7 +645,7 @@ BOOL GtkSalGraphics::hitTestNativeControl( ControlType      nType,
         Rectangle aForward;
         Rectangle aBackward;
 
-        rIsInside = FALSE;
+        rIsInside = sal_False;
 
         ControlPart nCounterPart = 0;
         if ( nPart == PART_BUTTON_UP )
@@ -704,17 +704,17 @@ BOOL GtkSalGraphics::hitTestNativeControl( ControlType      nType,
             if ( has_forward2 )
                 rIsInside |= aForward.IsInside( aPos );
         }
-        return ( TRUE );
+        return ( sal_True );
     }
 
     if( IsNativeControlSupported(nType, nPart) )
     {
         rIsInside = rControlRegion.IsInside( aPos );
-        return( TRUE );
+        return( sal_True );
     }
     else
     {
-        return( FALSE );
+        return( sal_False );
     }
 }
 
@@ -728,14 +728,14 @@ BOOL GtkSalGraphics::hitTestNativeControl( ControlType      nType,
  *  aValue:         An optional value (tristate/numerical/string)
  *  rCaption:   A caption or title string (like button text etc)
  */
-BOOL GtkSalGraphics::drawNativeControl( ControlType nType,
+sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType,
                             ControlPart nPart,
                             const Rectangle& rControlRegion,
                             ControlState nState,
                             const ImplControlValue& aValue,
                             const OUString& rCaption )
 {
-    BOOL            returnVal = FALSE;
+    sal_Bool            returnVal = sal_False;
     // get a GC with current clipping region set
     GetFontGC();
 
@@ -747,7 +747,7 @@ BOOL GtkSalGraphics::drawNativeControl( ControlType nType,
         for( unsigned int i = 0; i < gWidgetData.size(); i++ )
             if( gWidgetData[i].gNWPixmapCacheList )
                 gWidgetData[i].gNWPixmapCacheList->ThemeChanged();
-        GtkSalGraphics::bThemeChanged = FALSE;
+        GtkSalGraphics::bThemeChanged = sal_False;
     }
 
     Rectangle aCtrlRect( rControlRegion );
@@ -774,7 +774,7 @@ BOOL GtkSalGraphics::drawNativeControl( ControlType nType,
                                  Size( aCtrlRect.GetWidth()+2, aCtrlRect.GetHeight()+2) );
         pixmap = NWGetPixmapFromScreen( aPixmapRect );
         if( ! pixmap )
-            return FALSE;
+            return sal_False;
         gdkDrawable = GDK_DRAWABLE( pixmap );
         aCtrlRect = Rectangle( Point(1,1), aCtrlRect.GetSize() );
         aClip.push_back( aCtrlRect );
@@ -835,7 +835,7 @@ BOOL GtkSalGraphics::drawNativeControl( ControlType nType,
     else if ( (nType==CTRL_TAB_ITEM) || (nType==CTRL_TAB_PANE) || (nType==CTRL_TAB_BODY) || (nType==CTRL_FIXEDBORDER) )
     {
         if ( nType == CTRL_TAB_BODY )
-            returnVal = TRUE;
+            returnVal = sal_True;
         else
             returnVal = NWPaintGTKTabItem( nType, nPart, aCtrlRect, aClip, nState, aValue, rCaption);
     }
@@ -902,22 +902,22 @@ BOOL GtkSalGraphics::drawNativeControl( ControlType nType,
  *  aValue:         An optional value (tristate/numerical/string)
  *  rCaption:   A caption or title string (like button text etc)
  */
-BOOL GtkSalGraphics::drawNativeControlText( ControlType,
+sal_Bool GtkSalGraphics::drawNativeControlText( ControlType,
                                 ControlPart,
                                 const Rectangle&,
                                 ControlState,
                                 const ImplControlValue&,
                                 const OUString& )
 {
-    return( FALSE );
+    return( sal_False );
 }
 
 
 /*
  * GetNativeControlRegion()
  *
- *  If the return value is TRUE, rNativeBoundingRegion
- *  contains the TRUE bounding region covered by the control
+ *  If the return value is sal_True, rNativeBoundingRegion
+ *  contains the true bounding region covered by the control
  *  including any adornment, while rNativeContentRegion contains the area
  *  within the control that can be safely drawn into without drawing over
  *  the borders of the control.
@@ -926,7 +926,7 @@ BOOL GtkSalGraphics::drawNativeControlText( ControlType,
  *  aValue:     An optional value (tristate/numerical/string)
  *  rCaption:       A caption or title string (like button text etc)
  */
-BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
+sal_Bool GtkSalGraphics::getNativeControlRegion(  ControlType nType,
                                 ControlPart nPart,
                                 const Rectangle& rControlRegion,
                                 ControlState nState,
@@ -935,7 +935,7 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
                                 Rectangle &rNativeBoundingRegion,
                                 Rectangle &rNativeContentRegion )
 {
-    BOOL returnVal = FALSE;
+    sal_Bool returnVal = sal_False;
 
     if ( (nType==CTRL_PUSHBUTTON) && (nPart==PART_ENTIRE_CONTROL)
         && (rControlRegion.GetWidth() > 16)
@@ -945,7 +945,7 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
         nState, aValue, rCaption );
         rNativeContentRegion = rControlRegion;
 
-        returnVal = TRUE;
+        returnVal = sal_True;
     }
     if ( (nType==CTRL_COMBOBOX) && ((nPart==PART_BUTTON_DOWN) || (nPart==PART_SUB_EDIT)) )
     {
@@ -953,7 +953,7 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
         aValue, rCaption );
         rNativeContentRegion = rNativeBoundingRegion;
 
-        returnVal = TRUE;
+        returnVal = sal_True;
     }
     if ( (nType==CTRL_SPINBOX) && ((nPart==PART_BUTTON_UP) || (nPart==PART_BUTTON_DOWN) || (nPart==PART_SUB_EDIT)) )
     {
@@ -962,7 +962,7 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
         aValue, rCaption );
         rNativeContentRegion = rNativeBoundingRegion;
 
-        returnVal = TRUE;
+        returnVal = sal_True;
     }
     if ( (nType==CTRL_LISTBOX) && ((nPart==PART_BUTTON_DOWN) || (nPart==PART_SUB_EDIT)) )
     {
@@ -970,7 +970,7 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
         aValue, rCaption );
         rNativeContentRegion = rNativeBoundingRegion;
 
-        returnVal = TRUE;
+        returnVal = sal_True;
     }
     if ( (nType==CTRL_TOOLBAR) &&
         ((nPart==PART_DRAW_BACKGROUND_HORZ) ||
@@ -982,7 +982,7 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
     {
         rNativeBoundingRegion = NWGetToolbarRect( m_nScreen, nType, nPart, rControlRegion, nState, aValue, rCaption );
         rNativeContentRegion = rNativeBoundingRegion;
-        returnVal = TRUE;
+        returnVal = sal_True;
     }
     if ( (nType==CTRL_SCROLLBAR) && ((nPart==PART_BUTTON_LEFT) || (nPart==PART_BUTTON_RIGHT) ||
         (nPart==PART_BUTTON_UP) || (nPart==PART_BUTTON_DOWN)  ) )
@@ -990,7 +990,7 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
         rNativeBoundingRegion = NWGetScrollButtonRect( m_nScreen, nPart, rControlRegion );
         rNativeContentRegion = rNativeBoundingRegion;
 
-        returnVal = TRUE;
+        returnVal = sal_True;
     }
     if( (nType == CTRL_MENUBAR) && (nPart == PART_ENTIRE_CONTROL) )
     {
@@ -1002,7 +1002,7 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
                                   Size( aMenuBarRect.GetWidth(), aReq.height+1 ) );
         rNativeBoundingRegion = aMenuBarRect;
         rNativeContentRegion = rNativeBoundingRegion;
-        returnVal = TRUE;
+        returnVal = sal_True;
     }
     if( (nType == CTRL_MENU_POPUP) )
     {
@@ -1022,7 +1022,7 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
                                              (rControlRegion.GetHeight()-indicator_size)/2),
                                       Size( indicator_size, indicator_size ) );
             rNativeContentRegion = aIndicatorRect;
-            returnVal = TRUE;
+            returnVal = sal_True;
         }
     }
     if( (nType == CTRL_RADIOBUTTON || nType == CTRL_CHECKBOX) )
@@ -1041,7 +1041,7 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
                                          (rControlRegion.GetHeight()-indicator_size)/2),
                                   Size( indicator_size, indicator_size ) );
         rNativeContentRegion = aIndicatorRect;
-        returnVal = TRUE;
+        returnVal = sal_True;
     }
     if( (nType == CTRL_EDITBOX || nType == CTRL_SPINBOX) && nPart == PART_ENTIRE_CONTROL )
     {
@@ -1055,7 +1055,7 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
                                Size( aEditRect.GetWidth(), nHeight ) );
         rNativeBoundingRegion = aEditRect;
         rNativeContentRegion = rNativeBoundingRegion;
-        returnVal = TRUE;
+        returnVal = sal_True;
     }
     if( (nType == CTRL_SLIDER) && (nPart == PART_THUMB_HORZ || nPart == PART_THUMB_VERT) )
     {
@@ -1079,7 +1079,7 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
             aRect.Right() = aRect.Left() + slider_width - 1;
         }
         rNativeBoundingRegion = rNativeContentRegion = aRect;
-        returnVal = TRUE;
+        returnVal = sal_True;
     }
 
     return( returnVal );
@@ -1089,7 +1089,7 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
 /************************************************************************
  * Individual control drawing functions
  ************************************************************************/
-BOOL GtkSalGraphics::NWPaintGTKButton(
+sal_Bool GtkSalGraphics::NWPaintGTKButton(
             GdkDrawable* gdkDrawable,
             ControlType, ControlPart,
             const Rectangle& rControlRectangle,
@@ -1102,7 +1102,7 @@ BOOL GtkSalGraphics::NWPaintGTKButton(
     gboolean        interiorFocus;
     gint            focusWidth;
     gint            focusPad;
-    BOOL            bDrawFocus = TRUE;
+    sal_Bool            bDrawFocus = sal_True;
     gint            x, y, w, h;
     GtkBorder       aDefBorder;
     GtkBorder*      pBorder;
@@ -1133,7 +1133,7 @@ BOOL GtkSalGraphics::NWPaintGTKButton(
 
     // If the button is too small, don't ever draw focus or grab more space
     if ( (w < 16) || (h < 16) )
-        bDrawFocus = FALSE;
+        bDrawFocus = sal_False;
 
     NWSetWidgetState( gWidgetData[m_nScreen].gBtnWidget, nState, stateType );
 
@@ -1203,7 +1203,7 @@ BOOL GtkSalGraphics::NWPaintGTKButton(
     }
 #endif
 
-    return( TRUE );
+    return( sal_True );
 }
 
 static Rectangle NWGetButtonArea( int nScreen,
@@ -1215,7 +1215,7 @@ static Rectangle NWGetButtonArea( int nScreen,
     gint            focusPad;
     GtkBorder       aDefBorder;
     GtkBorder * pBorder;
-    BOOL            bDrawFocus = TRUE;
+    sal_Bool            bDrawFocus = sal_True;
     Rectangle       aRect;
     gint            x, y, w, h;
 
@@ -1242,7 +1242,7 @@ static Rectangle NWGetButtonArea( int nScreen,
 
     // If the button is too small, don't ever draw focus or grab more space
     if ( (w < 16) || (h < 16) )
-        bDrawFocus = FALSE;
+        bDrawFocus = sal_False;
 
     if ( (nState & CTRL_STATE_DEFAULT) && bDrawFocus )
     {
@@ -1259,7 +1259,7 @@ static Rectangle NWGetButtonArea( int nScreen,
 
 //-------------------------------------
 
-BOOL GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable,
+sal_Bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable,
                                       ControlType, ControlPart,
                                       const Rectangle& rControlRectangle,
                                       const clipList& rClipList,
@@ -1269,7 +1269,7 @@ BOOL GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable,
 {
     GtkStateType    stateType;
     GtkShadowType   shadowType;
-    BOOL            isChecked = (aValue.getTristateVal()==BUTTONVALUE_ON);
+    sal_Bool            isChecked = (aValue.getTristateVal()==BUTTONVALUE_ON);
     gint            x, y;
     GdkRectangle    clipRect;
 
@@ -1297,7 +1297,7 @@ BOOL GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable,
     // intermediate states between active/inactive. Let's hope that
     // GtkToggleButtone stays binary compatible.
     if (!isChecked)
-        GTK_TOGGLE_BUTTON(gWidgetData[m_nScreen].gRadioWidgetSibling)->active = TRUE;
+        GTK_TOGGLE_BUTTON(gWidgetData[m_nScreen].gRadioWidgetSibling)->active = sal_True;
     GTK_TOGGLE_BUTTON(gWidgetData[m_nScreen].gRadioWidget)->active = isChecked;
 
     for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
@@ -1312,12 +1312,12 @@ BOOL GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable,
                           x, y, indicator_size, indicator_size );
     }
 
-    return( TRUE );
+    return( sal_True );
 }
 
 //-------------------------------------
 
-BOOL GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable,
+sal_Bool GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable,
                                       ControlType, ControlPart,
                                       const Rectangle& rControlRectangle,
                                       const clipList& rClipList,
@@ -1359,7 +1359,7 @@ BOOL GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable,
                          x, y, indicator_size, indicator_size );
     }
 
-    return( TRUE );
+    return( sal_True );
 }
 
 //-------------------------------------
@@ -1375,7 +1375,7 @@ static void NWCalcArrowRect( const Rectangle& rButton, Rectangle& rArrow )
         ) );
 }
 
-BOOL GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
+sal_Bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
                                           const Rectangle& rControlRectangle,
                                           const clipList&,
                                           ControlState nState,
@@ -1430,7 +1430,7 @@ BOOL GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
     scrollbarRect = pixmapRect;
 
     if ( (scrollbarRect.GetWidth() <= 1) || (scrollbarRect.GetHeight() <= 1) )
-        return( TRUE );
+        return( sal_True );
 
     // Grab some button style attributes
     gtk_widget_style_get( gWidgetData[m_nScreen].gScrollHorizWidget,
@@ -1556,7 +1556,7 @@ BOOL GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
         thumbRect.Move( (scrollbarRect.GetWidth() - slider_width) / 2, 0 );
     }
 
-    BOOL has_slider = ( thumbRect.GetWidth() > 0 && thumbRect.GetHeight() > 0 );
+    sal_Bool has_slider = ( thumbRect.GetWidth() > 0 && thumbRect.GetHeight() > 0 );
 
     scrollbarValues = gtk_range_get_adjustment( GTK_RANGE(scrollbarWidget) );
     if ( scrollbarValues == NULL )
@@ -1581,7 +1581,7 @@ BOOL GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
     // painting them directly to the window flickers
     pixmap = NWGetPixmapFromScreen( pixmapRect );
     if( ! pixmap )
-        return FALSE;
+        return sal_False;
     x = y = 0;
 
     w = pixmapRect.GetWidth();
@@ -1635,7 +1635,7 @@ BOOL GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
         // ----------------- ARROW 1
         NWCalcArrowRect( button11BoundRect, arrowRect );
         gtk_paint_arrow( style, gdkDrawable, stateType, shadowType,
-                         gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button1Type, TRUE,
+                         gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button1Type, sal_True,
                          x+hShim+arrowRect.Left(), y+vShim+arrowRect.Top(),
                          arrowRect.GetWidth(), arrowRect.GetHeight() );
     }
@@ -1650,7 +1650,7 @@ BOOL GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
         // ----------------- ARROW 1
         NWCalcArrowRect( button12BoundRect, arrowRect );
         gtk_paint_arrow( style, gdkDrawable, stateType, shadowType,
-                         gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button2Type, TRUE,
+                         gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button2Type, sal_True,
                          x+hShim+arrowRect.Left(), y+vShim+arrowRect.Top(),
                          arrowRect.GetWidth(), arrowRect.GetHeight() );
     }
@@ -1666,7 +1666,7 @@ BOOL GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
         // ----------------- ARROW 2
         NWCalcArrowRect( button21BoundRect, arrowRect );
         gtk_paint_arrow( style, gdkDrawable, stateType, shadowType,
-                         gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button1Type, TRUE,
+                         gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button1Type, sal_True,
                          x+hShim+arrowRect.Left(), y+vShim+arrowRect.Top(),
                          arrowRect.GetWidth(), arrowRect.GetHeight() );
     }
@@ -1681,7 +1681,7 @@ BOOL GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
         // ----------------- ARROW 2
         NWCalcArrowRect( button22BoundRect, arrowRect );
         gtk_paint_arrow( style, gdkDrawable, stateType, shadowType,
-                         gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button2Type, TRUE,
+                         gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button2Type, sal_True,
                          x+hShim+arrowRect.Left(), y+vShim+arrowRect.Top(),
                          arrowRect.GetWidth(), arrowRect.GetHeight() );
     }
@@ -1689,11 +1689,11 @@ BOOL GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
     if( !NWRenderPixmapToScreen(pixmap, pixmapRect) )
     {
         g_object_unref( pixmap );
-        return( FALSE );
+        return( sal_False );
     }
     g_object_unref( pixmap );
 
-    return( TRUE );
+    return( sal_True );
 }
 
 //---
@@ -1781,7 +1781,7 @@ static Rectangle NWGetScrollButtonRect( int nScreen, ControlPart nPart, Rectangl
 
 //-------------------------------------
 
-BOOL GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable,
+sal_Bool GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable,
                                         ControlType nType, ControlPart nPart,
                                         const Rectangle& rControlRectangle,
                                         const clipList& rClipList,
@@ -1806,7 +1806,7 @@ BOOL GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable,
         NWPaintOneEditBox( m_nScreen, gdkDrawable, &clipRect, nType, nPart, pixmapRect, nState, aValue, rCaption );
     }
 
-    return( TRUE );
+    return( sal_True );
 }
 
 
@@ -1919,7 +1919,7 @@ static void NWPaintOneEditBox(  int nScreen,
 
 //-------------------------------------
 
-BOOL GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart,
+sal_Bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart,
                                         const Rectangle& rControlRectangle,
                                         const clipList&,
                                         ControlState nState,
@@ -1970,7 +1970,7 @@ BOOL GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart,
 
     pixmap = NWGetPixmapFromScreen( pixmapRect );
     if ( !pixmap )
-        return( FALSE );
+        return( sal_False );
 
     upBtnRect = NWGetSpinButtonRect( m_nScreen, nType, upBtnPart, pixmapRect, upBtnState, aValue, rCaption );
     downBtnRect = NWGetSpinButtonRect( m_nScreen, nType, downBtnPart, pixmapRect, downBtnState, aValue, rCaption );
@@ -2006,11 +2006,11 @@ BOOL GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart,
     if( !NWRenderPixmapToScreen(pixmap, pixmapRect) )
     {
         g_object_unref( pixmap );
-        return( FALSE );
+        return( sal_False );
     }
 
     g_object_unref( pixmap );
-    return( TRUE );
+    return( sal_True );
 }
 
 //---
@@ -2093,7 +2093,7 @@ static void NWPaintOneSpinButton( int nScreen,
         arrowRect.setY( buttonRect.Top() + (buttonRect.GetHeight() - arrowRect.GetHeight()) / 2 - 1);
 
     gtk_paint_arrow( gWidgetData[nScreen].gSpinButtonWidget->style, pixmap, stateType, GTK_SHADOW_OUT, NULL, gWidgetData[nScreen].gSpinButtonWidget,
-            "spinbutton", (nPart == PART_BUTTON_UP) ? GTK_ARROW_UP : GTK_ARROW_DOWN, TRUE,
+            "spinbutton", (nPart == PART_BUTTON_UP) ? GTK_ARROW_UP : GTK_ARROW_DOWN, sal_True,
             (arrowRect.Left() - aAreaRect.Left()), (arrowRect.Top() - aAreaRect.Top()),
             arrowRect.GetWidth(), arrowRect.GetHeight() );
 }
@@ -2101,7 +2101,7 @@ static void NWPaintOneSpinButton( int nScreen,
 
 //-------------------------------------
 
-BOOL GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable,
+sal_Bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable,
                                          ControlType nType, ControlPart nPart,
                                          const Rectangle& rControlRectangle,
                                          const clipList& rClipList,
@@ -2169,12 +2169,12 @@ BOOL GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable,
                        buttonRect.GetWidth(), buttonRect.GetHeight() );
 
         gtk_paint_arrow( gWidgetData[m_nScreen].gArrowWidget->style, gdkDrawable, stateType, shadowType,
-                         &clipRect, gWidgetData[m_nScreen].gArrowWidget, "arrow", GTK_ARROW_DOWN, TRUE,
+                         &clipRect, gWidgetData[m_nScreen].gArrowWidget, "arrow", GTK_ARROW_DOWN, sal_True,
                          x+(arrowRect.Left() - pixmapRect.Left()), y+(arrowRect.Top() - pixmapRect.Top()),
                          arrowRect.GetWidth(), arrowRect.GetHeight() );
     }
 
-    return( TRUE );
+    return( sal_True );
 }
 
 //----
@@ -2234,7 +2234,7 @@ static Rectangle NWGetComboBoxButtonRect( int nScreen,
 
 
 
-BOOL GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
+sal_Bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
                                         const Rectangle& rControlRectangle,
                                         const clipList&,
                                         ControlState nState,
@@ -2368,14 +2368,14 @@ BOOL GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
     else
         aCachePage.Fill( nType, nState, pixmapRect, pixmap );
 
-    BOOL bSuccess = NWRenderPixmapToScreen(pixmap, pixmapRect);
+    sal_Bool bSuccess = NWRenderPixmapToScreen(pixmap, pixmapRect);
     g_object_unref( pixmap );
     return bSuccess;
 }
 
 //-------------------------------------
 
-BOOL GtkSalGraphics::NWPaintGTKListBox( GdkDrawable* gdkDrawable,
+sal_Bool GtkSalGraphics::NWPaintGTKListBox( GdkDrawable* gdkDrawable,
                                         ControlType nType, ControlPart nPart,
                                         const Rectangle& rControlRectangle,
                                         const clipList& rClipList,
@@ -2466,10 +2466,10 @@ BOOL GtkSalGraphics::NWPaintGTKListBox( GdkDrawable* gdkDrawable,
         }
     }
 
-    return( TRUE );
+    return( sal_True );
 }
 
-BOOL GtkSalGraphics::NWPaintGTKToolbar(
+sal_Bool GtkSalGraphics::NWPaintGTKToolbar(
             GdkDrawable* gdkDrawable,
             ControlType, ControlPart nPart,
             const Rectangle& rControlRectangle,
@@ -2615,12 +2615,12 @@ BOOL GtkSalGraphics::NWPaintGTKToolbar(
         }
     }
 
-    return( TRUE );
+    return( sal_True );
 }
 
 //----
 
-BOOL GtkSalGraphics::NWPaintGTKMenubar(
+sal_Bool GtkSalGraphics::NWPaintGTKMenubar(
             GdkDrawable* gdkDrawable,
             ControlType, ControlPart nPart,
             const Rectangle& rControlRectangle,
@@ -2702,10 +2702,10 @@ BOOL GtkSalGraphics::NWPaintGTKMenubar(
         }
     }
 
-    return( TRUE );
+    return( sal_True );
 }
 
-BOOL GtkSalGraphics::NWPaintGTKPopupMenu(
+sal_Bool GtkSalGraphics::NWPaintGTKPopupMenu(
             GdkDrawable* gdkDrawable,
             ControlType, ControlPart nPart,
             const Rectangle& rControlRectangle,
@@ -2716,7 +2716,7 @@ BOOL GtkSalGraphics::NWPaintGTKPopupMenu(
     // #i50745# gtk does not draw disabled menu entries (and crux theme
     // even crashes), draw them using vcl functionality.
     if( nPart == PART_MENU_ITEM && ! (nState & CTRL_STATE_ENABLED) )
-        return FALSE;
+        return sal_False;
 
     GtkStateType    stateType;
     GtkShadowType   shadowType;
@@ -2832,10 +2832,10 @@ BOOL GtkSalGraphics::NWPaintGTKPopupMenu(
         }
     }
 
-    return( TRUE );
+    return( sal_True );
 }
 
-BOOL GtkSalGraphics::NWPaintGTKTooltip(
+sal_Bool GtkSalGraphics::NWPaintGTKTooltip(
             GdkDrawable* gdkDrawable,
             ControlType, ControlPart,
             const Rectangle& rControlRectangle,
@@ -2870,10 +2870,10 @@ BOOL GtkSalGraphics::NWPaintGTKTooltip(
                             x, y, w, h );
     }
 
-    return( TRUE );
+    return( sal_True );
 }
 
-BOOL GtkSalGraphics::NWPaintGTKListNode(
+sal_Bool GtkSalGraphics::NWPaintGTKListNode(
             GdkDrawable*,
             ControlType, ControlPart,
             const Rectangle& rControlRectangle,
@@ -2909,7 +2909,7 @@ BOOL GtkSalGraphics::NWPaintGTKListNode(
 
     GdkPixmap* pixmap = NWGetPixmapFromScreen( aRect );
     if( ! pixmap )
-        return FALSE;
+        return sal_False;
 
     GdkDrawable* const &pixDrawable = GDK_DRAWABLE( pixmap );
     gtk_paint_expander( gWidgetData[m_nScreen].gTreeView->style,
@@ -2921,13 +2921,13 @@ BOOL GtkSalGraphics::NWPaintGTKListNode(
                         w/2, h/2,
                         eStyle );
 
-    BOOL bRet = NWRenderPixmapToScreen( pixmap, aRect );
+    sal_Bool bRet = NWRenderPixmapToScreen( pixmap, aRect );
     g_object_unref( pixmap );
 
     return bRet;
 }
 
-BOOL GtkSalGraphics::NWPaintGTKProgress(
+sal_Bool GtkSalGraphics::NWPaintGTKProgress(
             GdkDrawable*,
             ControlType, ControlPart,
             const Rectangle& rControlRectangle,
@@ -2945,7 +2945,7 @@ BOOL GtkSalGraphics::NWPaintGTKProgress(
 
     GdkPixmap* pixmap = NWGetPixmapFromScreen( Rectangle( Point( 0, 0 ), Size( w, h ) ) );
     if( ! pixmap )
-        return FALSE;
+        return sal_False;
 
     GdkDrawable* const &pixDrawable = GDK_DRAWABLE( pixmap );
 
@@ -2985,13 +2985,13 @@ BOOL GtkSalGraphics::NWPaintGTKProgress(
         }
     }
 
-    BOOL bRet = NWRenderPixmapToScreen( pixmap, rControlRectangle );
+    sal_Bool bRet = NWRenderPixmapToScreen( pixmap, rControlRectangle );
     g_object_unref( pixmap );
 
     return bRet;
 }
 
-BOOL GtkSalGraphics::NWPaintGTKSlider(
+sal_Bool GtkSalGraphics::NWPaintGTKSlider(
             GdkDrawable*,
             ControlType, ControlPart nPart,
             const Rectangle& rControlRectangle,
@@ -3010,7 +3010,7 @@ BOOL GtkSalGraphics::NWPaintGTKSlider(
 
     GdkPixmap* pixmap = NWGetPixmapFromScreen( rControlRectangle );
     if( ! pixmap )
-        return FALSE;
+        return sal_False;
 
     GdkDrawable* const &pixDrawable = GDK_DRAWABLE( pixmap );
     GtkWidget* pWidget = (nPart == PART_TRACK_HORZ_AREA)
@@ -3111,7 +3111,7 @@ BOOL GtkSalGraphics::NWPaintGTKSlider(
     }
     #endif
 
-    BOOL bRet = NWRenderPixmapToScreen( pixmap, rControlRectangle );
+    sal_Bool bRet = NWRenderPixmapToScreen( pixmap, rControlRectangle );
     g_object_unref( pixmap );
 
     return bRet;
@@ -3360,9 +3360,9 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     else
     {
         Color aColor2 = aStyleSet.GetLightColor();
-        Color aCheck( (BYTE)(((USHORT)aBackColor.GetRed()+(USHORT)aColor2.GetRed())/2),
-                      (BYTE)(((USHORT)aBackColor.GetGreen()+(USHORT)aColor2.GetGreen())/2),
-                      (BYTE)(((USHORT)aBackColor.GetBlue()+(USHORT)aColor2.GetBlue())/2)
+        Color aCheck( (sal_uInt8)(((sal_uInt16)aBackColor.GetRed()+(sal_uInt16)aColor2.GetRed())/2),
+                      (sal_uInt8)(((sal_uInt16)aBackColor.GetGreen()+(sal_uInt16)aColor2.GetGreen())/2),
+                      (sal_uInt8)(((sal_uInt16)aBackColor.GetBlue()+(sal_uInt16)aColor2.GetBlue())/2)
                       );
         aStyleSet.SetCheckedColor( aCheck );
     }
@@ -3398,7 +3398,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     aStyleSet.SetInactiveTabColor( aSelectedBackColor );
 
     // menu disabled entries handling
-    aStyleSet.SetSkipDisabledInMenus( TRUE );
+    aStyleSet.SetSkipDisabledInMenus( sal_True );
     // menu colors
     GtkStyle* pMenuStyle = gtk_widget_get_style( gWidgetData[m_nScreen].gMenuWidget );
     GtkStyle* pMenuItemStyle = gtk_rc_get_style( gWidgetData[m_nScreen].gMenuItemMenuWidget );
@@ -3684,18 +3684,18 @@ GdkPixmap* GtkSalGraphics::NWGetPixmapFromScreen( Rectangle srcRect )
  * Copy an alpha pixmap to screen using a gc with clipping
  ************************************************************************/
 
-BOOL GtkSalGraphics::NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRect )
+sal_Bool GtkSalGraphics::NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRect )
 {
     // The GC can't be null, otherwise we'd have no clip region
     GC aFontGC = GetFontGC();
     if( aFontGC == NULL )
     {
         std::fprintf(stderr, "salnativewidgets.cxx: no valid GC\n" );
-        return( FALSE );
+        return( sal_False );
     }
 
     if ( !pPixmap )
-        return( FALSE );
+        return( sal_False );
 
     // Copy the background of the screen into a composite pixmap
     CopyScreenArea( GetXDisplay(),
@@ -3706,7 +3706,7 @@ BOOL GtkSalGraphics::NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRe
               aFontGC,
               0, 0, dstRect.GetWidth(), dstRect.GetHeight(), dstRect.Left(), dstRect.Top() );
 
-    return( TRUE );
+    return( sal_True );
 }
 
 
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 9181ee3fd40d..aa5926702731 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -83,9 +83,9 @@ using namespace com::sun::star;
 
 int GtkSalFrame::m_nFloats = 0;
 
-static USHORT GetKeyModCode( guint state )
+static sal_uInt16 GetKeyModCode( guint state )
 {
-    USHORT nCode = 0;
+    sal_uInt16 nCode = 0;
     if( (state & GDK_SHIFT_MASK) )
         nCode |= KEY_SHIFT;
     if( (state & GDK_CONTROL_MASK) )
@@ -100,9 +100,9 @@ static USHORT GetKeyModCode( guint state )
     return nCode;
 }
 
-static USHORT GetMouseModCode( guint state )
+static sal_uInt16 GetMouseModCode( guint state )
 {
-    USHORT nCode = GetKeyModCode( state );
+    sal_uInt16 nCode = GetKeyModCode( state );
     if( (state & GDK_BUTTON1_MASK) )
         nCode |= MOUSE_LEFT;
     if( (state & GDK_BUTTON2_MASK) )
@@ -113,9 +113,9 @@ static USHORT GetMouseModCode( guint state )
     return nCode;
 }
 
-static USHORT GetKeyCode( guint keyval )
+static sal_uInt16 GetKeyCode( guint keyval )
 {
-    USHORT nCode = 0;
+    sal_uInt16 nCode = 0;
     if( keyval >= GDK_0 && keyval <= GDK_9 )
         nCode = KEY_0 + (keyval-GDK_0);
     else if( keyval >= GDK_KP_0 && keyval <= GDK_KP_9 )
@@ -297,14 +297,14 @@ static USHORT GetKeyCode( guint keyval )
 // in the independent part.
 struct KeyAlternate
 {
-    USHORT          nKeyCode;
+    sal_uInt16          nKeyCode;
     sal_Unicode     nCharCode;
     KeyAlternate() : nKeyCode( 0 ), nCharCode( 0 ) {}
-    KeyAlternate( USHORT nKey, sal_Unicode nChar = 0 ) : nKeyCode( nKey ), nCharCode( nChar ) {}
+    KeyAlternate( sal_uInt16 nKey, sal_Unicode nChar = 0 ) : nKeyCode( nKey ), nCharCode( nChar ) {}
 };
 
 inline KeyAlternate
-GetAlternateKeyCode( const USHORT nKeyCode )
+GetAlternateKeyCode( const sal_uInt16 nKeyCode )
 {
     KeyAlternate aAlternate;
 
@@ -392,7 +392,7 @@ GtkSalFrame::GraphicsHolder::~GraphicsHolder()
     delete pGraphics;
 }
 
-GtkSalFrame::GtkSalFrame( SalFrame* pParent, ULONG nStyle )
+GtkSalFrame::GtkSalFrame( SalFrame* pParent, sal_uLong nStyle )
 {
     m_nScreen = getDisplay()->GetDefaultScreenNumber();
     getDisplay()->registerFrame( this );
@@ -568,7 +568,7 @@ void GtkSalFrame::InitCommon()
     m_ePointerStyle     = 0xffff;
     m_bSetFocusOnMap    = false;
 
-    gtk_widget_set_app_paintable( m_pWindow, TRUE );
+    gtk_widget_set_app_paintable( m_pWindow, sal_True );
     gtk_widget_set_double_buffered( m_pWindow, FALSE );
     gtk_widget_set_redraw_on_allocate( m_pWindow, FALSE );
     gtk_widget_add_events( m_pWindow,
@@ -755,7 +755,7 @@ GtkSalFrame *GtkSalFrame::getFromWindow( GtkWindow *pWindow )
     return (GtkSalFrame *) g_object_get_data( G_OBJECT( pWindow ), "SalFrame" );
 }
 
-void GtkSalFrame::Init( SalFrame* pParent, ULONG nStyle )
+void GtkSalFrame::Init( SalFrame* pParent, sal_uLong nStyle )
 {
     if( nStyle & SAL_FRAME_STYLE_DEFAULT ) // ensure default style
     {
@@ -823,7 +823,7 @@ void GtkSalFrame::Init( SalFrame* pParent, ULONG nStyle )
         else if( (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) )
         {
             eType = GDK_WINDOW_TYPE_HINT_TOOLBAR;
-            lcl_set_accept_focus( GTK_WINDOW(m_pWindow), FALSE, true );
+            lcl_set_accept_focus( GTK_WINDOW(m_pWindow), sal_False, true );
             bNoDecor = true;
         }
         else if( (nStyle & SAL_FRAME_STYLE_FLOAT_FOCUSABLE) )
@@ -868,9 +868,9 @@ void GtkSalFrame::Init( SalFrame* pParent, ULONG nStyle )
 
     if( bDecoHandling )
     {
-        gtk_window_set_resizable( GTK_WINDOW(m_pWindow), (nStyle & SAL_FRAME_STYLE_SIZEABLE) ? TRUE : FALSE );
+        gtk_window_set_resizable( GTK_WINDOW(m_pWindow), (nStyle & SAL_FRAME_STYLE_SIZEABLE) ? sal_True : FALSE );
         if( ( (nStyle & (SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ) )
-            lcl_set_accept_focus( GTK_WINDOW(m_pWindow), FALSE, false );
+            lcl_set_accept_focus( GTK_WINDOW(m_pWindow), sal_False, false );
     }
 
 }
@@ -1029,10 +1029,10 @@ void GtkSalFrame::ReleaseGraphics( SalGraphics* pGraphics )
     }
 }
 
-BOOL GtkSalFrame::PostEvent( void* pData )
+sal_Bool GtkSalFrame::PostEvent( void* pData )
 {
     getDisplay()->SendInternalEvent( this, pData );
-    return TRUE;
+    return sal_True;
 }
 
 void GtkSalFrame::SetTitle( const String& rTitle )
@@ -1042,8 +1042,8 @@ void GtkSalFrame::SetTitle( const String& rTitle )
         gtk_window_set_title( GTK_WINDOW(m_pWindow), rtl::OUStringToOString( rTitle, RTL_TEXTENCODING_UTF8 ).getStr() );
 }
 
-static inline BYTE *
-getRow( BitmapBuffer *pBuffer, ULONG nRow )
+static inline sal_uInt8 *
+getRow( BitmapBuffer *pBuffer, sal_uLong nRow )
 {
     if( BMP_SCANLINE_ADJUSTMENT( pBuffer->mnFormat ) == BMP_FORMAT_TOP_DOWN )
         return pBuffer->mpBits + nRow * pBuffer->mnScanlineSize;
@@ -1057,11 +1057,11 @@ bitmapToPixbuf( SalBitmap *pSalBitmap, SalBitmap *pSalAlpha )
     g_return_val_if_fail( pSalBitmap != NULL, NULL );
     g_return_val_if_fail( pSalAlpha != NULL, NULL );
 
-    BitmapBuffer *pBitmap = pSalBitmap->AcquireBuffer( TRUE );
+    BitmapBuffer *pBitmap = pSalBitmap->AcquireBuffer( sal_True );
     g_return_val_if_fail( pBitmap != NULL, NULL );
     g_return_val_if_fail( pBitmap->mnBitCount == 24, NULL );
 
-    BitmapBuffer *pAlpha = pSalAlpha->AcquireBuffer( TRUE );
+    BitmapBuffer *pAlpha = pSalAlpha->AcquireBuffer( sal_True );
     g_return_val_if_fail( pAlpha != NULL, NULL );
     g_return_val_if_fail( pAlpha->mnBitCount == 8, NULL );
 
@@ -1074,8 +1074,8 @@ bitmapToPixbuf( SalBitmap *pSalBitmap, SalBitmap *pSalAlpha )
 
     for( nY = 0; nY < pBitmap->mnHeight; nY++ )
     {
-        BYTE *pData = getRow( pBitmap, nY );
-        BYTE *pAlphaData = getRow( pAlpha, nY );
+        sal_uInt8 *pData = getRow( pBitmap, nY );
+        sal_uInt8 *pAlphaData = getRow( pAlpha, nY );
 
         for( nX = 0; nX < pBitmap->mnWidth; nX++ )
         {
@@ -1096,18 +1096,18 @@ bitmapToPixbuf( SalBitmap *pSalBitmap, SalBitmap *pSalAlpha )
         }
     }
 
-    pSalBitmap->ReleaseBuffer( pBitmap, TRUE );
-    pSalAlpha->ReleaseBuffer( pAlpha, TRUE );
+    pSalBitmap->ReleaseBuffer( pBitmap, sal_True );
+    pSalAlpha->ReleaseBuffer( pAlpha, sal_True );
 
     return gdk_pixbuf_new_from_data( pPixbufData,
-                                     GDK_COLORSPACE_RGB, TRUE, 8,
+                                     GDK_COLORSPACE_RGB, sal_True, 8,
                                      aSize.Width(), aSize.Height(),
                                      aSize.Width() * 4,
                                      (GdkPixbufDestroyNotify) g_free,
                                      NULL );
 }
 
-void GtkSalFrame::SetIcon( USHORT nIcon )
+void GtkSalFrame::SetIcon( sal_uInt16 nIcon )
 {
     if( (m_nStyle & (SAL_FRAME_STYLE_PLUG|SAL_FRAME_STYLE_SYSTEMCHILD|SAL_FRAME_STYLE_FLOAT|SAL_FRAME_STYLE_INTRO|SAL_FRAME_STYLE_OWNERDRAWDECORATION))
         || ! m_pWindow )
@@ -1119,8 +1119,8 @@ void GtkSalFrame::SetIcon( USHORT nIcon )
     GdkPixbuf *pBuf;
     GList *pIcons = NULL;
 
-    USHORT nOffsets[2] = { SV_ICON_SMALL_START, SV_ICON_LARGE_START };
-    USHORT nIndex;
+    sal_uInt16 nOffsets[2] = { SV_ICON_SMALL_START, SV_ICON_LARGE_START };
+    sal_uInt16 nIndex;
 
     // Use high contrast icons where appropriate
     if( Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
@@ -1129,7 +1129,7 @@ void GtkSalFrame::SetIcon( USHORT nIcon )
         nOffsets[1] = SV_ICON_SMALL_HC_START;
     }
 
-    for( nIndex = 0; nIndex < sizeof(nOffsets)/ sizeof(USHORT); nIndex++ )
+    for( nIndex = 0; nIndex < sizeof(nOffsets)/ sizeof(sal_uInt16); nIndex++ )
     {
         // #i44723# workaround gcc temporary problem
         ResId aResId( nOffsets[nIndex] + nIcon, *ImplGetResMgr() );
@@ -1148,7 +1148,7 @@ void GtkSalFrame::SetIcon( USHORT nIcon )
                 {
                     case TRANSPARENT_NONE:
                     {
-                        BYTE nTrans = 0;
+                        sal_uInt8 nTrans = 0;
                         aMask = AlphaMask( aBmp.GetSizePixel(), &nTrans );
                     }
                     break;
@@ -1288,7 +1288,7 @@ static void initClientId()
     }
 }
 
-void GtkSalFrame::Show( BOOL bVisible, BOOL bNoActivate )
+void GtkSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate )
 {
     if( m_pWindow )
     {
@@ -1323,7 +1323,7 @@ void GtkSalFrame::Show( BOOL bVisible, BOOL bNoActivate )
                  * showing the float (cannot grab it to the float
                  * before show).
                  */
-                 m_pParent->grabPointer( TRUE, TRUE );
+                 m_pParent->grabPointer( sal_True, sal_True );
             }
 
             guint32 nUserTime = 0;
@@ -1370,7 +1370,7 @@ void GtkSalFrame::Show( BOOL bVisible, BOOL bNoActivate )
             {
                 m_nFloats++;
                 if( ! getDisplay()->GetCaptureFrame() && m_nFloats == 1 )
-                    grabPointer( TRUE, TRUE );
+                    grabPointer( sal_True, sal_True );
                 // #i44068# reset parent's IM context
                 if( m_pParent )
                     m_pParent->EndExtTextInput(0);
@@ -1384,7 +1384,7 @@ void GtkSalFrame::Show( BOOL bVisible, BOOL bNoActivate )
             {
                 m_nFloats--;
                 if( ! getDisplay()->GetCaptureFrame() && m_nFloats == 0)
-                    grabPointer( FALSE );
+                    grabPointer( sal_False );
             }
             gtk_widget_hide( m_pWindow );
             if( m_pIMHandler )
@@ -1397,7 +1397,7 @@ void GtkSalFrame::Show( BOOL bVisible, BOOL bNoActivate )
     }
 }
 
-void GtkSalFrame::Enable( BOOL /*bEnable*/ )
+void GtkSalFrame::Enable( sal_Bool /*bEnable*/ )
 {
     // Not implemented by X11SalFrame either
 }
@@ -1487,7 +1487,7 @@ void GtkSalFrame::SetMinClientSize( long nWidth, long nHeight )
     }
 }
 
-void GtkSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, USHORT nFlags )
+void GtkSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags )
 {
     if( !m_pWindow || isChild( true, false ) )
         return;
@@ -1602,7 +1602,7 @@ void GtkSalFrame::SetWindowState( const SalFrameState* pState )
     if( ! m_pWindow || ! pState || isChild( true, false ) )
         return;
 
-    const ULONG nMaxGeometryMask =
+    const sal_uLong nMaxGeometryMask =
         SAL_FRAMESTATE_MASK_X | SAL_FRAMESTATE_MASK_Y |
         SAL_FRAMESTATE_MASK_WIDTH | SAL_FRAMESTATE_MASK_HEIGHT |
         SAL_FRAMESTATE_MASK_MAXIMIZED_X | SAL_FRAMESTATE_MASK_MAXIMIZED_Y |
@@ -1630,7 +1630,7 @@ void GtkSalFrame::SetWindowState( const SalFrameState* pState )
     else if( pState->mnMask & (SAL_FRAMESTATE_MASK_X | SAL_FRAMESTATE_MASK_Y |
                                SAL_FRAMESTATE_MASK_WIDTH | SAL_FRAMESTATE_MASK_HEIGHT ) )
     {
-        USHORT nPosSizeFlags = 0;
+        sal_uInt16 nPosSizeFlags = 0;
         long nX         = pState->mnX - (m_pParent ? m_pParent->maGeometry.nX : 0);
         long nY         = pState->mnY - (m_pParent ? m_pParent->maGeometry.nY : 0);
         long nWidth     = pState->mnWidth;
@@ -1675,7 +1675,7 @@ void GtkSalFrame::SetWindowState( const SalFrameState* pState )
     }
 }
 
-BOOL GtkSalFrame::GetWindowState( SalFrameState* pState )
+sal_Bool GtkSalFrame::GetWindowState( SalFrameState* pState )
 {
     pState->mnState = SAL_FRAMESTATE_NORMAL;
     pState->mnMask  = SAL_FRAMESTATE_MASK_STATE;
@@ -1711,7 +1711,7 @@ BOOL GtkSalFrame::GetWindowState( SalFrameState* pState )
                        SAL_FRAMESTATE_MASK_WIDTH        |
                        SAL_FRAMESTATE_MASK_HEIGHT;
 
-    return TRUE;
+    return sal_True;
 }
 
 void GtkSalFrame::moveToScreen( int nScreen )
@@ -1775,13 +1775,13 @@ void GtkSalFrame::SetScreenNumber( unsigned int nNewScreen )
             Rectangle aNewScreenRect( pDisp->GetXineramaScreens()[nNewScreen] );
             bool bVisible = GTK_WIDGET_MAPPED(m_pWindow);
             if( bVisible )
-                Show( FALSE );
+                Show( sal_False );
             maGeometry.nX = aNewScreenRect.Left() + (maGeometry.nX - aOldScreenRect.Left());
             maGeometry.nY = aNewScreenRect.Top() + (maGeometry.nY - aOldScreenRect.Top());
             createNewWindow( None, false, m_nScreen );
             gtk_window_move( GTK_WINDOW(m_pWindow), maGeometry.nX, maGeometry.nY );
             if( bVisible )
-                Show( TRUE );
+                Show( sal_True );
             maGeometry.nScreenNumber = nNewScreen;
         }
         else if( sal_Int32(nNewScreen) < pDisp->GetScreenCount() )
@@ -1793,7 +1793,7 @@ void GtkSalFrame::SetScreenNumber( unsigned int nNewScreen )
     }
 }
 
-void GtkSalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nScreen )
+void GtkSalFrame::ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nScreen )
 {
     if( m_pWindow && ! isChild() )
     {
@@ -1807,7 +1807,7 @@ void GtkSalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nScreen )
                                                Size( maGeometry.nWidth, maGeometry.nHeight ) );
                 bool bVisible = GTK_WIDGET_MAPPED(m_pWindow);
                 if( bVisible )
-                    Show( FALSE );
+                    Show( sal_False );
                 m_nStyle |= SAL_FRAME_STYLE_PARTIAL_FULLSCREEN;
                 createNewWindow( None, false, m_nScreen );
                 Rectangle aNewPosSize;
@@ -1830,11 +1830,11 @@ void GtkSalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nScreen )
                 if( ! getDisplay()->getWMAdaptor()->isLegacyPartialFullscreen() )
                 {
                     if( !(m_nStyle & SAL_FRAME_STYLE_SIZEABLE) )
-                        gtk_window_set_resizable( GTK_WINDOW(m_pWindow), TRUE );
+                        gtk_window_set_resizable( GTK_WINDOW(m_pWindow), sal_True );
                     gtk_window_fullscreen( GTK_WINDOW( m_pWindow ) );
                 }
                 if( bVisible )
-                    Show( TRUE );
+                    Show( sal_True );
             }
             else
             {
@@ -1842,7 +1842,7 @@ void GtkSalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nScreen )
                 if( ! getDisplay()->getWMAdaptor()->isLegacyPartialFullscreen() )
                     gtk_window_unfullscreen( GTK_WINDOW(m_pWindow) );
                 if( bVisible )
-                    Show( FALSE );
+                    Show( sal_False );
                 m_nStyle &= ~SAL_FRAME_STYLE_PARTIAL_FULLSCREEN;
                 createNewWindow( None, false, m_nScreen );
                 if( ! m_aRestorePosSize.IsEmpty() )
@@ -1856,7 +1856,7 @@ void GtkSalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nScreen )
                     m_aRestorePosSize = Rectangle();
                 }
                 if( bVisible )
-                    Show( TRUE );
+                    Show( sal_True );
             }
         }
         else
@@ -2025,7 +2025,7 @@ dbus_uninhibit_gsm (guint cookie)
 }
 #endif
 
-void GtkSalFrame::StartPresentation( BOOL bStart )
+void GtkSalFrame::StartPresentation( sal_Bool bStart )
 {
     Display *pDisplay = GDK_DISPLAY_XDISPLAY( getGdkDisplay() );
 
@@ -2062,11 +2062,11 @@ void GtkSalFrame::StartPresentation( BOOL bStart )
     }
 }
 
-void GtkSalFrame::SetAlwaysOnTop( BOOL /*bOnTop*/ )
+void GtkSalFrame::SetAlwaysOnTop( sal_Bool /*bOnTop*/ )
 {
 }
 
-void GtkSalFrame::ToTop( USHORT nFlags )
+void GtkSalFrame::ToTop( sal_uInt16 nFlags )
 {
     if( m_pWindow )
     {
@@ -2117,13 +2117,13 @@ void GtkSalFrame::SetPointer( PointerStyle ePointerStyle )
 
         // #i80791# use grabPointer the same way as CaptureMouse, respective float grab
         if( getDisplay()->MouseCaptured( this ) )
-            grabPointer( TRUE, FALSE );
+            grabPointer( sal_True, sal_False );
         else if( m_nFloats > 0 )
-            grabPointer( TRUE, TRUE );
+            grabPointer( sal_True, sal_True );
     }
 }
 
-void GtkSalFrame::grabPointer( BOOL bGrab, BOOL bOwnerEvents )
+void GtkSalFrame::grabPointer( sal_Bool bGrab, sal_Bool bOwnerEvents )
 {
     if( m_pWindow )
     {
@@ -2180,7 +2180,7 @@ void GtkSalFrame::grabPointer( BOOL bGrab, BOOL bOwnerEvents )
     }
 }
 
-void GtkSalFrame::CaptureMouse( BOOL bCapture )
+void GtkSalFrame::CaptureMouse( sal_Bool bCapture )
 {
     getDisplay()->CaptureMouse( bCapture ? this : NULL );
 }
@@ -2225,12 +2225,12 @@ void GtkSalFrame::Sync()
     gdk_display_sync( getGdkDisplay() );
 }
 
-String GtkSalFrame::GetSymbolKeyName( const String&, USHORT nKeyCode )
+String GtkSalFrame::GetSymbolKeyName( const String&, sal_uInt16 nKeyCode )
 {
   return getDisplay()->GetKeyName( nKeyCode );
 }
 
-String GtkSalFrame::GetKeyName( USHORT nKeyCode )
+String GtkSalFrame::GetKeyName( sal_uInt16 nKeyCode )
 {
     return getDisplay()->GetKeyName( nKeyCode );
 }
@@ -2271,16 +2271,16 @@ void GtkSalFrame::SetInputContext( SalInputContext* pContext )
     m_pIMHandler->setInputContext( pContext );
 }
 
-void GtkSalFrame::EndExtTextInput( USHORT nFlags )
+void GtkSalFrame::EndExtTextInput( sal_uInt16 nFlags )
 {
     if( m_pIMHandler )
         m_pIMHandler->endExtTextInput( nFlags );
 }
 
-BOOL GtkSalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , KeyCode& )
+sal_Bool GtkSalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , KeyCode& )
 {
     // not supported yet
-    return FALSE;
+    return sal_False;
 }
 
 LanguageType GtkSalFrame::GetInputLanguage()
@@ -2358,7 +2358,7 @@ void GtkSalFrame::createNewWindow( XLIB_Window aNewParent, bool bXEmbed, int nSc
 {
     bool bWasVisible = GTK_WIDGET_MAPPED(m_pWindow);
     if( bWasVisible )
-        Show( FALSE );
+        Show( sal_False );
 
     if( nScreen < 0 || nScreen >= getDisplay()->GetScreenCount() )
         nScreen = m_nScreen;
@@ -2438,7 +2438,7 @@ void GtkSalFrame::createNewWindow( XLIB_Window aNewParent, bool bXEmbed, int nSc
         SetTitle( m_aTitle );
 
     if( bWasVisible )
-        Show( TRUE );
+        Show( sal_True );
 
     std::list< GtkSalFrame* > aChildren = m_aChildren;
     m_aChildren.clear();
@@ -2462,7 +2462,7 @@ void GtkSalFrame::ResetClipRegion()
         gdk_window_shape_combine_region( m_pWindow->window, NULL, 0, 0 );
 }
 
-void GtkSalFrame::BeginSetClipRegion( ULONG )
+void GtkSalFrame::BeginSetClipRegion( sal_uLong )
 {
     if( m_pRegion )
         gdk_region_destroy( m_pRegion );
@@ -2555,7 +2555,7 @@ bool GtkSalFrame::Dispatch( const XEvent* pEvent )
             GdkEventFocus aEvent;
             aEvent.type = GDK_FOCUS_CHANGE;
             aEvent.window = m_pWindow->window;
-            aEvent.send_event = TRUE;
+            aEvent.send_event = sal_True;
             aEvent.in = (pEvent->xclient.data.l[1] == 1);
             signalFocus( m_pWindow, &aEvent, this );
         }
@@ -2609,7 +2609,7 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer
 {
     GtkSalFrame* pThis = (GtkSalFrame*)frame;
     SalMouseEvent aEvent;
-    USHORT nEventType = 0;
+    sal_uInt16 nEventType = 0;
     switch( pEvent->type )
     {
         case GDK_BUTTON_PRESS:
@@ -2619,14 +2619,14 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer
             nEventType = SALEVENT_MOUSEBUTTONUP;
             break;
         default:
-            return FALSE;
+            return sal_False;
     }
     switch( pEvent->button )
     {
         case 1: aEvent.mnButton = MOUSE_LEFT;   break;
         case 2: aEvent.mnButton = MOUSE_MIDDLE; break;
         case 3: aEvent.mnButton = MOUSE_RIGHT;  break;
-        default: return FALSE;
+        default: return sal_False;
     }
     aEvent.mnTime   = pEvent->time;
     aEvent.mnX      = (long)pEvent->x_root - pThis->maGeometry.nX;
@@ -2694,7 +2694,7 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer
         }
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame )
@@ -2702,7 +2702,7 @@ gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame
     GtkSalFrame* pThis = (GtkSalFrame*)frame;
     GdkEventScroll* pSEvent = (GdkEventScroll*)pEvent;
 
-    static ULONG        nLines = 0;
+    static sal_uLong        nLines = 0;
     if( ! nLines )
     {
         char* pEnv = getenv( "SAL_WHEELLINES" );
@@ -2714,8 +2714,8 @@ gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame
     bool bNeg = (pSEvent->direction == GDK_SCROLL_DOWN || pSEvent->direction == GDK_SCROLL_RIGHT );
     SalWheelMouseEvent aEvent;
     aEvent.mnTime           = pSEvent->time;
-    aEvent.mnX              = (ULONG)pSEvent->x;
-    aEvent.mnY              = (ULONG)pSEvent->y;
+    aEvent.mnX              = (sal_uLong)pSEvent->x;
+    aEvent.mnY              = (sal_uLong)pSEvent->y;
     aEvent.mnDelta          = bNeg ? -120 : 120;
     aEvent.mnNotchDelta     = bNeg ? -1 : 1;
     aEvent.mnScrollLines    = nLines;
@@ -2730,7 +2730,7 @@ gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame
 
     pThis->CallCallback( SALEVENT_WHEELMOUSE, &aEvent );
 
-    return FALSE;
+    return sal_False;
 }
 
 gboolean GtkSalFrame::signalMotion( GtkWidget*, GdkEventMotion* pEvent, gpointer frame )
@@ -2775,7 +2775,7 @@ gboolean GtkSalFrame::signalMotion( GtkWidget*, GdkEventMotion* pEvent, gpointer
         }
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 gboolean GtkSalFrame::signalCrossing( GtkWidget*, GdkEventCrossing* pEvent, gpointer frame )
@@ -2791,7 +2791,7 @@ gboolean GtkSalFrame::signalCrossing( GtkWidget*, GdkEventCrossing* pEvent, gpoi
     GTK_YIELD_GRAB();
     pThis->CallCallback( (pEvent->type == GDK_ENTER_NOTIFY) ? SALEVENT_MOUSEMOVE : SALEVENT_MOUSELEAVE, &aEvent );
 
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -2804,7 +2804,7 @@ gboolean GtkSalFrame::signalExpose( GtkWidget*, GdkEventExpose* pEvent, gpointer
     GTK_YIELD_GRAB();
     pThis->CallCallback( SALEVENT_PAINT, &aEvent );
 
-    return FALSE;
+    return sal_False;
 }
 
 gboolean GtkSalFrame::signalFocus( GtkWidget*, GdkEventFocus* pEvent, gpointer frame )
@@ -2840,7 +2840,7 @@ gboolean GtkSalFrame::signalFocus( GtkWidget*, GdkEventFocus* pEvent, gpointer f
     if( m_nFloats == 0 )
         pThis->CallCallback( pEvent->in ? SALEVENT_GETFOCUS : SALEVENT_LOSEFOCUS, NULL );
 
-    return FALSE;
+    return sal_False;
 }
 
 IMPL_LINK( GtkSalFrame, ImplDelayedFullScreenHdl, void*, EMPTYARG )
@@ -2912,7 +2912,7 @@ gboolean GtkSalFrame::signalMap( GtkWidget*, GdkEvent*, gpointer frame )
 
     pThis->CallCallback( SALEVENT_RESIZE, NULL );
 
-    return FALSE;
+    return sal_False;
 }
 
 gboolean GtkSalFrame::signalUnmap( GtkWidget*, GdkEvent*, gpointer frame )
@@ -2922,7 +2922,7 @@ gboolean GtkSalFrame::signalUnmap( GtkWidget*, GdkEvent*, gpointer frame )
     GTK_YIELD_GRAB();
     pThis->CallCallback( SALEVENT_RESIZE, NULL );
 
-    return FALSE;
+    return sal_False;
 }
 
 gboolean GtkSalFrame::signalConfigure( GtkWidget*, GdkEventConfigure* pEvent, gpointer frame )
@@ -2942,7 +2942,7 @@ gboolean GtkSalFrame::signalConfigure( GtkWidget*, GdkEventConfigure* pEvent, gp
      */
     if( (pThis->m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) &&
         pThis->getDisplay()->GetCaptureFrame() == pThis )
-        return FALSE;
+        return sal_False;
 
 
     // in child case the coordinates are not root coordinates,
@@ -3011,7 +3011,7 @@ gboolean GtkSalFrame::signalConfigure( GtkWidget*, GdkEventConfigure* pEvent, gp
     else if( bSized )
         pThis->CallCallback( SALEVENT_RESIZE, NULL );
 
-    return FALSE;
+    return sal_False;
 }
 
 gboolean GtkSalFrame::signalKey( GtkWidget*, GdkEventKey* pEvent, gpointer frame )
@@ -3025,7 +3025,7 @@ gboolean GtkSalFrame::signalKey( GtkWidget*, GdkEventKey* pEvent, gpointer frame
         if( pThis->m_pIMHandler->handleKeyEvent( pEvent ) )
         {
             pThis->m_bSingleAltPress = false;
-            return TRUE;
+            return sal_True;
         }
     }
     GTK_YIELD_GRAB();
@@ -3039,7 +3039,7 @@ gboolean GtkSalFrame::signalKey( GtkWidget*, GdkEventKey* pEvent, gpointer frame
     {
         SalKeyModEvent aModEvt;
 
-        USHORT nModCode = GetKeyModCode( pEvent->state );
+        sal_uInt16 nModCode = GetKeyModCode( pEvent->state );
 
         aModEvt.mnModKeyCode = 0; // emit no MODKEYCHANGE events
         if( pEvent->type == GDK_KEY_PRESS && !pThis->m_nKeyModifiers )
@@ -3052,8 +3052,8 @@ gboolean GtkSalFrame::signalKey( GtkWidget*, GdkEventKey* pEvent, gpointer frame
             pThis->m_nKeyModifiers = 0;
         }
 
-        USHORT nExtModMask = 0;
-        USHORT nModMask = 0;
+        sal_uInt16 nExtModMask = 0;
+        sal_uInt16 nModMask = 0;
         // pressing just the ctrl key leads to a keysym of XK_Control but
         // the event state does not contain ControlMask. In the release
         // event its the other way round: it does contain the Control mask.
@@ -3164,7 +3164,7 @@ gboolean GtkSalFrame::signalKey( GtkWidget*, GdkEventKey* pEvent, gpointer frame
     if( !aDel.isDeleted() && pThis->m_pIMHandler )
         pThis->m_pIMHandler->updateIMSpotLocation();
 
-    return TRUE;
+    return sal_True;
 }
 
 gboolean GtkSalFrame::signalDelete( GtkWidget*, GdkEvent*, gpointer frame )
@@ -3174,7 +3174,7 @@ gboolean GtkSalFrame::signalDelete( GtkWidget*, GdkEvent*, gpointer frame )
     GTK_YIELD_GRAB();
     pThis->CallCallback( SALEVENT_CLOSE, NULL );
 
-    return TRUE;
+    return sal_True;
 }
 
 void GtkSalFrame::signalStyleSet( GtkWidget*, GtkStyle* pPrevious, gpointer frame )
@@ -3213,7 +3213,7 @@ void GtkSalFrame::signalStyleSet( GtkWidget*, GtkStyle* pPrevious, gpointer fram
     {
         // signalize theme changed for NWF caches
         // FIXME: should be called only once for a style change
-        GtkSalGraphics::bThemeChanged = TRUE;
+        GtkSalGraphics::bThemeChanged = sal_True;
     }
 }
 
@@ -3241,7 +3241,7 @@ gboolean GtkSalFrame::signalState( GtkWidget*, GdkEvent* pEvent, gpointer frame
     }
     #endif
 
-    return FALSE;
+    return sal_False;
 }
 
 gboolean GtkSalFrame::signalVisibility( GtkWidget*, GdkEventVisibility* pEvent, gpointer frame )
@@ -3249,7 +3249,7 @@ gboolean GtkSalFrame::signalVisibility( GtkWidget*, GdkEventVisibility* pEvent,
     GtkSalFrame* pThis = (GtkSalFrame*)frame;
     pThis->m_nVisibility = pEvent->state;
 
-    return FALSE;
+    return sal_False;
 }
 
 void GtkSalFrame::signalDestroy( GtkObject* pObj, gpointer frame )
@@ -3365,7 +3365,7 @@ void GtkSalFrame::IMHandler::sendEmptyCommit()
         m_pFrame->CallCallback( SALEVENT_ENDEXTTEXTINPUT, NULL );
 }
 
-void GtkSalFrame::IMHandler::endExtTextInput( USHORT /*nFlags*/ )
+void GtkSalFrame::IMHandler::endExtTextInput( sal_uInt16 /*nFlags*/ )
 {
     gtk_im_context_reset ( m_pIMContext );
 
@@ -3641,7 +3641,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_
     pThis->m_aInputEvent.mnDeltaStart       = 0;
     pThis->m_aInputEvent.mbOnlyCursor       = False;
 
-    pThis->m_aInputFlags = std::vector<USHORT>( std::max( 1, (int)pThis->m_aInputEvent.maText.Len() ), 0 );
+    pThis->m_aInputFlags = std::vector<sal_uInt16>( std::max( 1, (int)pThis->m_aInputEvent.maText.Len() ), 0 );
 
     PangoAttrIterator   *iter       = pango_attr_list_get_iterator (pAttrs);
     do
@@ -3774,15 +3774,15 @@ gboolean GtkSalFrame::IMHandler::signalIMRetrieveSurrounding( GtkIMContext* pCon
         sal_uInt32 nPosition = xText->getCaretPosition();
         rtl::OUString sAllText = xText->getText();
         if (!sAllText.getLength())
-            return FALSE;
+            return sal_False;
     rtl::OString sUTF = rtl::OUStringToOString(sAllText, RTL_TEXTENCODING_UTF8);
     rtl::OUString sCursorText(sAllText, nPosition);
     gtk_im_context_set_surrounding(pContext, sUTF.getStr(), sUTF.getLength(),
         rtl::OUStringToOString(sCursorText, RTL_TEXTENCODING_UTF8).getLength());
-    return TRUE;
+    return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 gboolean GtkSalFrame::IMHandler::signalIMDeleteSurrounding( GtkIMContext*, gint offset, gint nchars,
@@ -3807,8 +3807,8 @@ gboolean GtkSalFrame::IMHandler::signalIMDeleteSurrounding( GtkIMContext*, gint
 
         xText->deleteText(nDeletePos, nDeleteEnd);
         // <--
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx
index c5f5a168f653..f7ef753dc628 100644
--- a/vcl/unx/gtk/window/gtkobject.cxx
+++ b/vcl/unx/gtk/window/gtkobject.cxx
@@ -33,7 +33,7 @@
 #include <plugins/gtk/gtkdata.hxx>
 #include <plugins/gtk/gtkinst.hxx>
 
-GtkSalObject::GtkSalObject( GtkSalFrame* pParent, BOOL bShow )
+GtkSalObject::GtkSalObject( GtkSalFrame* pParent, sal_Bool bShow )
         : m_pSocket( NULL ),
           m_pRegion( NULL )
 {
@@ -104,12 +104,12 @@ void GtkSalObject::ResetClipRegion()
         gdk_window_shape_combine_region( m_pSocket->window, NULL, 0, 0 );
 }
 
-USHORT GtkSalObject::GetClipRegionType()
+sal_uInt16 GtkSalObject::GetClipRegionType()
 {
     return SAL_OBJECT_CLIP_INCLUDERECTS;
 }
 
-void GtkSalObject::BeginSetClipRegion( ULONG )
+void GtkSalObject::BeginSetClipRegion( sal_uLong )
 {
     if( m_pRegion )
         gdk_region_destroy( m_pRegion );
@@ -144,7 +144,7 @@ void GtkSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight )
     }
 }
 
-void GtkSalObject::Show( BOOL bVisible )
+void GtkSalObject::Show( sal_Bool bVisible )
 {
     if( m_pSocket )
     {
@@ -155,7 +155,7 @@ void GtkSalObject::Show( BOOL bVisible )
     }
 }
 
-void GtkSalObject::Enable( BOOL )
+void GtkSalObject::Enable( sal_Bool )
 {
 }
 
diff --git a/vcl/unx/headless/svpbmp.cxx b/vcl/unx/headless/svpbmp.cxx
index 7c84c4a7a579..f96da7b0c12b 100644
--- a/vcl/unx/headless/svpbmp.cxx
+++ b/vcl/unx/headless/svpbmp.cxx
@@ -43,7 +43,7 @@ SvpSalBitmap::~SvpSalBitmap()
 }
 
 bool SvpSalBitmap::Create( const Size& rSize,
-                           USHORT nBitCount,
+                           sal_uInt16 nBitCount,
                            const BitmapPalette& rPalette )
 {
     sal_uInt32 nFormat = SVP_DEFAULT_BITMAP_FORMAT;
@@ -111,7 +111,7 @@ bool SvpSalBitmap::Create( const SalBitmap& /*rSalBmp*/,
 }
 
 bool SvpSalBitmap::Create( const SalBitmap& /*rSalBmp*/,
-                           USHORT /*nNewBitCount*/ )
+                           sal_uInt16 /*nNewBitCount*/ )
 {
     return false;
 }
@@ -133,9 +133,9 @@ Size SvpSalBitmap::GetSize() const
     return aSize;
 }
 
-USHORT SvpSalBitmap::GetBitCount() const
+sal_uInt16 SvpSalBitmap::GetBitCount() const
 {
-    USHORT nDepth = 0;
+    sal_uInt16 nDepth = 0;
     if( m_aBitmap.get() )
         nDepth = getBitCountFromScanlineFormat( m_aBitmap->getScanlineFormat() );
     return nDepth;
@@ -147,7 +147,7 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( bool )
     if( m_aBitmap.get() )
     {
         pBuf = new BitmapBuffer();
-        USHORT nBitCount = 1;
+        sal_uInt16 nBitCount = 1;
         switch( m_aBitmap->getScanlineFormat() )
         {
             case Format::ONE_BIT_MSB_GREY:
@@ -216,7 +216,7 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( bool )
         pBuf->mnHeight          = aSize.getY();
         pBuf->mnScanlineSize    = m_aBitmap->getScanlineStride();
         pBuf->mnBitCount        = nBitCount;
-        pBuf->mpBits            = (BYTE*)m_aBitmap->getBuffer().get();
+        pBuf->mpBits            = (sal_uInt8*)m_aBitmap->getBuffer().get();
         if( nBitCount <= 8 )
         {
             if( m_aBitmap->getScanlineFormat() == Format::EIGHT_BIT_GREY ||
@@ -255,7 +255,7 @@ void SvpSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly )
     {
         // palette might have changed, clone device (but recycle
         // memory)
-        USHORT nBitCount = 0;
+        sal_uInt16 nBitCount = 0;
         switch( m_aBitmap->getScanlineFormat() )
         {
             case Format::ONE_BIT_MSB_GREY:
diff --git a/vcl/unx/headless/svpbmp.hxx b/vcl/unx/headless/svpbmp.hxx
index dc775e66aaf1..e62f24a171e2 100644
--- a/vcl/unx/headless/svpbmp.hxx
+++ b/vcl/unx/headless/svpbmp.hxx
@@ -46,16 +46,16 @@ public:
 
     // SalBitmap
     virtual bool            Create( const Size& rSize,
-                                    USHORT nBitCount,
+                                    sal_uInt16 nBitCount,
                                     const BitmapPalette& rPal );
     virtual bool            Create( const SalBitmap& rSalBmp );
     virtual bool            Create( const SalBitmap& rSalBmp,
                                     SalGraphics* pGraphics );
     virtual bool            Create( const SalBitmap& rSalBmp,
-                                    USHORT nNewBitCount );
+                                    sal_uInt16 nNewBitCount );
     virtual void            Destroy();
     virtual Size            GetSize() const;
-    virtual USHORT          GetBitCount() const;
+    virtual sal_uInt16              GetBitCount() const;
 
     virtual BitmapBuffer*   AcquireBuffer( bool bReadOnly );
     virtual void            ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly );
diff --git a/vcl/unx/headless/svpdummies.cxx b/vcl/unx/headless/svpdummies.cxx
index 0a67b147804a..162b3c5f755c 100644
--- a/vcl/unx/headless/svpdummies.cxx
+++ b/vcl/unx/headless/svpdummies.cxx
@@ -50,13 +50,13 @@ SvpSalObject::~SvpSalObject()
 }
 
 void SvpSalObject::ResetClipRegion() {}
-USHORT SvpSalObject::GetClipRegionType() { return 0; }
-void SvpSalObject::BeginSetClipRegion( ULONG ) {}
+sal_uInt16 SvpSalObject::GetClipRegionType() { return 0; }
+void SvpSalObject::BeginSetClipRegion( sal_uLong ) {}
 void SvpSalObject::UnionClipRegion( long, long, long, long ) {}
 void SvpSalObject::EndSetClipRegion() {}
 void SvpSalObject::SetPosSize( long, long, long, long ) {}
-void SvpSalObject::Show( BOOL ) {}
-void SvpSalObject::Enable( BOOL ) {}
+void SvpSalObject::Show( sal_Bool ) {}
+void SvpSalObject::Enable( sal_Bool ) {}
 void SvpSalObject::GrabFocus() {}
 void SvpSalObject::SetBackground() {}
 void SvpSalObject::SetBackground( SalColor ) {}
diff --git a/vcl/unx/headless/svpdummies.hxx b/vcl/unx/headless/svpdummies.hxx
index ea7667ce51ca..a72ba11e5c12 100644
--- a/vcl/unx/headless/svpdummies.hxx
+++ b/vcl/unx/headless/svpdummies.hxx
@@ -44,14 +44,14 @@ public:
 
     // overload all pure virtual methods
      virtual void                   ResetClipRegion();
-    virtual USHORT                  GetClipRegionType();
-    virtual void                    BeginSetClipRegion( ULONG nRects );
+    virtual sal_uInt16              GetClipRegionType();
+    virtual void                    BeginSetClipRegion( sal_uLong nRects );
     virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
     virtual void                    EndSetClipRegion();
 
     virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight );
-    virtual void                    Show( BOOL bVisible );
-    virtual void                    Enable( BOOL nEnable );
+    virtual void                    Show( sal_Bool bVisible );
+    virtual void                    Enable( sal_Bool nEnable );
     virtual void                    GrabFocus();
 
     virtual void                    SetBackground();
diff --git a/vcl/unx/headless/svpframe.cxx b/vcl/unx/headless/svpframe.cxx
index 1adf9a51cce4..9fb54cf29ef1 100644
--- a/vcl/unx/headless/svpframe.cxx
+++ b/vcl/unx/headless/svpframe.cxx
@@ -39,7 +39,7 @@ SvpSalFrame* SvpSalFrame::s_pFocusFrame = NULL;
 
 SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
                           SalFrame* pParent,
-                          ULONG nSalFrameStyle,
+                          sal_uLong nSalFrameStyle,
                           SystemParentData* ) :
     m_pInstance( pInstance ),
     m_pParent( static_cast<SvpSalFrame*>(pParent) ),
@@ -146,10 +146,10 @@ void SvpSalFrame::ReleaseGraphics( SalGraphics* pGraphics )
     delete pSvpGraphics;
 }
 
-BOOL SvpSalFrame::PostEvent( void* pData )
+sal_Bool SvpSalFrame::PostEvent( void* pData )
 {
     m_pInstance->PostEvent( this, pData, SALEVENT_USEREVENT );
-    return TRUE;
+    return sal_True;
 }
 
 void SvpSalFrame::PostPaint() const
@@ -165,7 +165,7 @@ void SvpSalFrame::SetTitle( const XubString& )
 {
 }
 
-void SvpSalFrame::SetIcon( USHORT )
+void SvpSalFrame::SetIcon( sal_uInt16 )
 {
 }
 
@@ -181,7 +181,7 @@ void SvpSalFrame::SetExtendedFrameStyle( SalExtStyle )
 {
 }
 
-void SvpSalFrame::Show( BOOL bVisible, BOOL bNoActivate )
+void SvpSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate )
 {
     if( bVisible && ! m_bVisible )
     {
@@ -198,7 +198,7 @@ void SvpSalFrame::Show( BOOL bVisible, BOOL bNoActivate )
     }
 }
 
-void SvpSalFrame::Enable( BOOL )
+void SvpSalFrame::Enable( sal_Bool )
 {
 }
 
@@ -214,7 +214,7 @@ void SvpSalFrame::SetMaxClientSize( long nWidth, long nHeight )
     m_nMaxHeight = nHeight;
 }
 
-void SvpSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, USHORT nFlags )
+void SvpSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags )
 {
     if( (nFlags & SAL_FRAME_POSSIZE_X) != 0 )
         maGeometry.nX = nX;
@@ -311,7 +311,7 @@ void SvpSalFrame::SetWindowState( const SalFrameState *pState )
     }
 }
 
-BOOL SvpSalFrame::GetWindowState( SalFrameState* pState )
+sal_Bool SvpSalFrame::GetWindowState( SalFrameState* pState )
 {
     pState->mnState = SAL_FRAMESTATE_NORMAL;
     pState->mnX      = maGeometry.nX;
@@ -320,24 +320,24 @@ BOOL SvpSalFrame::GetWindowState( SalFrameState* pState )
     pState->mnHeight = maGeometry.nHeight;
     pState->mnMask   = _FRAMESTATE_MASK_GEOMETRY | SAL_FRAMESTATE_MASK_STATE;
 
-    return TRUE;
+    return sal_True;
 }
 
-void SvpSalFrame::ShowFullScreen( BOOL, sal_Int32 )
+void SvpSalFrame::ShowFullScreen( sal_Bool, sal_Int32 )
 {
     SetPosSize( 0, 0, VIRTUAL_DESKTOP_WIDTH, VIRTUAL_DESKTOP_HEIGHT,
                 SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT );
 }
 
-void SvpSalFrame::StartPresentation( BOOL )
+void SvpSalFrame::StartPresentation( sal_Bool )
 {
 }
 
-void SvpSalFrame::SetAlwaysOnTop( BOOL )
+void SvpSalFrame::SetAlwaysOnTop( sal_Bool )
 {
 }
 
-void SvpSalFrame::ToTop( USHORT )
+void SvpSalFrame::ToTop( sal_uInt16 )
 {
     GetFocus();
 }
@@ -346,7 +346,7 @@ void SvpSalFrame::SetPointer( PointerStyle )
 {
 }
 
-void SvpSalFrame::CaptureMouse( BOOL )
+void SvpSalFrame::CaptureMouse( sal_Bool )
 {
 }
 
@@ -366,23 +366,23 @@ void SvpSalFrame::SetInputContext( SalInputContext* )
 {
 }
 
-void SvpSalFrame::EndExtTextInput( USHORT )
+void SvpSalFrame::EndExtTextInput( sal_uInt16 )
 {
 }
 
-String SvpSalFrame::GetKeyName( USHORT )
+String SvpSalFrame::GetKeyName( sal_uInt16 )
 {
     return String();
 }
 
-String SvpSalFrame::GetSymbolKeyName( const XubString&, USHORT )
+String SvpSalFrame::GetSymbolKeyName( const XubString&, sal_uInt16 )
 {
     return String();
 }
 
-BOOL SvpSalFrame::MapUnicodeToKeyCode( sal_Unicode, LanguageType, KeyCode& )
+sal_Bool SvpSalFrame::MapUnicodeToKeyCode( sal_Unicode, LanguageType, KeyCode& )
 {
-    return FALSE;
+    return sal_False;
 }
 
 LanguageType SvpSalFrame::GetInputLanguage()
@@ -435,7 +435,7 @@ void SvpSalFrame::ResetClipRegion()
 {
 }
 
-void SvpSalFrame::BeginSetClipRegion( ULONG )
+void SvpSalFrame::BeginSetClipRegion( sal_uLong )
 {
 }
 
diff --git a/vcl/unx/headless/svpframe.hxx b/vcl/unx/headless/svpframe.hxx
index de968bbf7a4a..af40fb66fb7f 100644
--- a/vcl/unx/headless/svpframe.hxx
+++ b/vcl/unx/headless/svpframe.hxx
@@ -40,9 +40,9 @@ class SvpSalGraphics;
 class SvpSalFrame : public SalFrame, public SvpElement
 {
     SvpSalInstance*                     m_pInstance;
-    SvpSalFrame*                        m_pParent;       // pointer to parent frame
+    SvpSalFrame*                    m_pParent;       // pointer to parent frame
     std::list< SvpSalFrame* >           m_aChildren;     // List of child frames
-    ULONG                               m_nStyle;
+    sal_uLong                         m_nStyle;
     bool                                m_bVisible;
     long                                m_nMinWidth;
     long                                m_nMinHeight;
@@ -58,7 +58,7 @@ class SvpSalFrame : public SalFrame, public SvpElement
 public:
     SvpSalFrame( SvpSalInstance* pInstance,
                  SalFrame* pParent,
-                 ULONG nSalFrameStyle,
+                 sal_uLong nSalFrameStyle,
                  SystemParentData* pSystemParent = NULL );
     virtual ~SvpSalFrame();
 
@@ -73,39 +73,39 @@ public:
     virtual SalGraphics*        GetGraphics();
     virtual void                ReleaseGraphics( SalGraphics* pGraphics );
 
-    virtual BOOL                PostEvent( void* pData );
+    virtual sal_Bool                PostEvent( void* pData );
 
     virtual void                SetTitle( const XubString& rTitle );
-    virtual void                SetIcon( USHORT nIcon );
+    virtual void                SetIcon( sal_uInt16 nIcon );
     virtual void                SetMenu( SalMenu* pMenu );
     virtual void                                DrawMenuBar();
 
     virtual void                SetExtendedFrameStyle( SalExtStyle nExtStyle );
-    virtual void                Show( BOOL bVisible, BOOL bNoActivate = FALSE );
-    virtual void                Enable( BOOL bEnable );
+    virtual void                Show( sal_Bool bVisible, sal_Bool bNoActivate = sal_False );
+    virtual void                Enable( sal_Bool bEnable );
     virtual void                SetMinClientSize( long nWidth, long nHeight );
     virtual void                SetMaxClientSize( long nWidth, long nHeight );
-    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, USHORT nFlags );
+    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags );
     virtual void                GetClientSize( long& rWidth, long& rHeight );
     virtual void                GetWorkArea( Rectangle& rRect );
     virtual SalFrame*           GetParent() const;
     virtual void                SetWindowState( const SalFrameState* pState );
-    virtual BOOL                GetWindowState( SalFrameState* pState );
-    virtual void                ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay );
-    virtual void                StartPresentation( BOOL bStart );
-    virtual void                SetAlwaysOnTop( BOOL bOnTop );
-    virtual void                ToTop( USHORT nFlags );
+    virtual sal_Bool                GetWindowState( SalFrameState* pState );
+    virtual void                ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay );
+    virtual void                StartPresentation( sal_Bool bStart );
+    virtual void                SetAlwaysOnTop( sal_Bool bOnTop );
+    virtual void                ToTop( sal_uInt16 nFlags );
     virtual void                SetPointer( PointerStyle ePointerStyle );
-    virtual void                CaptureMouse( BOOL bMouse );
+    virtual void                CaptureMouse( sal_Bool bMouse );
     virtual void                SetPointerPos( long nX, long nY );
     using SalFrame::Flush;
     virtual void                Flush();
     virtual void                Sync();
     virtual void                SetInputContext( SalInputContext* pContext );
-    virtual void                EndExtTextInput( USHORT nFlags );
-    virtual String              GetKeyName( USHORT nKeyCode );
-    virtual String              GetSymbolKeyName( const XubString& rFontName, USHORT nKeyCode );
-    virtual BOOL                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
+    virtual void                EndExtTextInput( sal_uInt16 nFlags );
+    virtual String              GetKeyName( sal_uInt16 nKeyCode );
+    virtual String              GetSymbolKeyName( const XubString& rFontName, sal_uInt16 nKeyCode );
+    virtual sal_Bool                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
     virtual LanguageType        GetInputLanguage();
     virtual SalBitmap*          SnapShot();
     virtual void                UpdateSettings( AllSettings& rSettings );
@@ -116,7 +116,7 @@ public:
     virtual bool                SetPluginParent( SystemParentData* pNewParent );
     virtual void                SetBackgroundBitmap( SalBitmap* pBitmap );
     virtual void                ResetClipRegion();
-    virtual void                BeginSetClipRegion( ULONG nRects );
+    virtual void                BeginSetClipRegion( sal_uLong nRects );
     virtual void                UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
     virtual void                EndSetClipRegion();
 
diff --git a/vcl/unx/headless/svpgdi.cxx b/vcl/unx/headless/svpgdi.cxx
index 68d8be7cb4eb..95ce1bb45a1d 100644
--- a/vcl/unx/headless/svpgdi.cxx
+++ b/vcl/unx/headless/svpgdi.cxx
@@ -131,7 +131,7 @@ void SvpSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
     rDPIX = rDPIY = 96;
 }
 
-USHORT SvpSalGraphics::GetBitCount()
+sal_uInt16 SvpSalGraphics::GetBitCount()
 {
     return SvpElement::getBitCountFromScanlineFormat( m_aDevice->getScanlineFormat() );
 }
@@ -152,7 +152,7 @@ void SvpSalGraphics::ResetClipRegion()
     m_aClipMap.reset();
 }
 
-void SvpSalGraphics::BeginSetClipRegion( ULONG n )
+void SvpSalGraphics::BeginSetClipRegion( sal_uLong n )
 {
     if( n <= 1 )
     {
@@ -167,7 +167,7 @@ void SvpSalGraphics::BeginSetClipRegion( ULONG n )
     }
 }
 
-BOOL SvpSalGraphics::unionClipRegion( long nX, long nY, long nWidth, long nHeight )
+sal_Bool SvpSalGraphics::unionClipRegion( long nX, long nY, long nWidth, long nHeight )
 {
     if( m_aClipMap )
     {
@@ -181,7 +181,7 @@ BOOL SvpSalGraphics::unionClipRegion( long nX, long nY, long nWidth, long nHeigh
                                                  basegfx::B2IRange(nX,nY,nX+nWidth,nY+nHeight) );
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 bool SvpSalGraphics::unionClipRegion( const ::basegfx::B2DPolyPolygon& )
@@ -309,13 +309,13 @@ void SvpSalGraphics::drawRect( long nX, long nY, long nWidth, long nHeight )
     dbgOut( m_aDevice );
 }
 
-void SvpSalGraphics::drawPolyLine( ULONG nPoints, const SalPoint* pPtAry )
+void SvpSalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry )
 {
     if( m_bUseLineColor && nPoints )
     {
         B2DPolygon aPoly;
         aPoly.append( B2DPoint( pPtAry->mnX, pPtAry->mnY ), nPoints );
-        for( ULONG i = 1; i < nPoints; i++ )
+        for( sal_uLong i = 1; i < nPoints; i++ )
             aPoly.setB2DPoint( i, B2DPoint( pPtAry[i].mnX, pPtAry[i].mnY ) );
         aPoly.setClosed( false );
         m_aDevice->drawPolygon( aPoly, m_aLineColor, m_aDrawMode, m_aClipMap );
@@ -323,13 +323,13 @@ void SvpSalGraphics::drawPolyLine( ULONG nPoints, const SalPoint* pPtAry )
     dbgOut( m_aDevice );
 }
 
-void SvpSalGraphics::drawPolygon( ULONG nPoints, const SalPoint* pPtAry )
+void SvpSalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
 {
     if( ( m_bUseLineColor || m_bUseFillColor ) && nPoints )
     {
         B2DPolygon aPoly;
         aPoly.append( B2DPoint( pPtAry->mnX, pPtAry->mnY ), nPoints );
-        for( ULONG i = 1; i < nPoints; i++ )
+        for( sal_uLong i = 1; i < nPoints; i++ )
             aPoly.setB2DPoint( i, B2DPoint( pPtAry[i].mnX, pPtAry[i].mnY ) );
         if( m_bUseFillColor )
         {
@@ -360,7 +360,7 @@ void SvpSalGraphics::drawPolyPolygon( sal_uInt32        nPoly,
                 PCONSTSALPOINT pPoints = pPtAry[nPolygon];
                 B2DPolygon aPoly;
                 aPoly.append( B2DPoint( pPoints->mnX, pPoints->mnY ), nPoints );
-                for( ULONG i = 1; i < nPoints; i++ )
+                for( sal_uInt32 i = 1; i < nPoints; i++ )
                     aPoly.setB2DPoint( i, B2DPoint( pPoints[i].mnX, pPoints[i].mnY ) );
 
                 aPolyPoly.append( aPoly );
@@ -388,16 +388,16 @@ bool SvpSalGraphics::drawPolyLine( const ::basegfx::B2DPolygon&, double /*fTrans
         return false;
 }
 
-sal_Bool SvpSalGraphics::drawPolyLineBezier( ULONG,
+sal_Bool SvpSalGraphics::drawPolyLineBezier( sal_uLong,
                                              const SalPoint*,
-                                             const BYTE* )
+                                             const sal_uInt8* )
 {
     return sal_False;
 }
 
-sal_Bool SvpSalGraphics::drawPolygonBezier( ULONG,
+sal_Bool SvpSalGraphics::drawPolygonBezier( sal_uLong,
                                             const SalPoint*,
-                                            const BYTE* )
+                                            const sal_uInt8* )
 {
     return sal_False;
 }
@@ -405,7 +405,7 @@ sal_Bool SvpSalGraphics::drawPolygonBezier( ULONG,
 sal_Bool SvpSalGraphics::drawPolyPolygonBezier( sal_uInt32,
                                                 const sal_uInt32*,
                                                 const SalPoint* const*,
-                                                const BYTE* const* )
+                                                const sal_uInt8* const* )
 {
     return sal_False;
 }
@@ -422,7 +422,7 @@ void SvpSalGraphics::copyArea( long nDestX,
                                       long nSrcY,
                                       long nSrcWidth,
                                       long nSrcHeight,
-                                      USHORT /*nFlags*/ )
+                                      sal_uInt16 /*nFlags*/ )
 {
     B2IRange aSrcRect( nSrcX, nSrcY, nSrcX+nSrcWidth, nSrcY+nSrcHeight );
     B2IRange aDestRect( nDestX, nDestY, nDestX+nSrcWidth, nDestY+nSrcHeight );
@@ -538,21 +538,21 @@ void SvpSalGraphics::invert( long nX, long nY, long nWidth, long nHeight, SalInv
     dbgOut( m_aDevice );
 }
 
-void SvpSalGraphics::invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert /*nFlags*/ )
+void SvpSalGraphics::invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert /*nFlags*/ )
 {
     // FIXME: handle SAL_INVERT_50 and SAL_INVERT_TRACKFRAME
     B2DPolygon aPoly;
     aPoly.append( B2DPoint( pPtAry->mnX, pPtAry->mnY ), nPoints );
-    for( ULONG i = 1; i < nPoints; i++ )
+    for( sal_uLong i = 1; i < nPoints; i++ )
         aPoly.setB2DPoint( i, B2DPoint( pPtAry[i].mnX, pPtAry[i].mnY ) );
     aPoly.setClosed( true );
     m_aDevice->fillPolyPolygon( B2DPolyPolygon(aPoly), basebmp::Color( 0xffffff ), DrawMode_XOR, m_aClipMap );
     dbgOut( m_aDevice );
 }
 
-BOOL SvpSalGraphics::drawEPS( long, long, long, long, void*, ULONG )
+sal_Bool SvpSalGraphics::drawEPS( long, long, long, long, void*, sal_uLong )
 {
-    return FALSE;
+    return sal_False;
 }
 
 SystemFontData SvpSalGraphics::GetSysFontData( int nFallbacklevel ) const
diff --git a/vcl/unx/headless/svpgdi.hxx b/vcl/unx/headless/svpgdi.hxx
index 93ec080d0136..a7486a55198f 100644
--- a/vcl/unx/headless/svpgdi.hxx
+++ b/vcl/unx/headless/svpgdi.hxx
@@ -64,12 +64,12 @@ public:
 
     // overload all pure virtual methods
     virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY );
-    virtual USHORT          GetBitCount();
+    virtual sal_uInt16          GetBitCount();
     virtual long            GetGraphicsWidth() const;
 
     virtual void            ResetClipRegion();
-    virtual void            BeginSetClipRegion( ULONG nCount );
-    virtual BOOL            unionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual void            BeginSetClipRegion( sal_uLong nCount );
+    virtual sal_Bool            unionClipRegion( long nX, long nY, long nWidth, long nHeight );
     virtual bool            unionClipRegion(  const ::basegfx::B2DPolyPolygon& );
     virtual void            EndSetClipRegion();
 
@@ -77,7 +77,7 @@ public:
     virtual void            SetLineColor( SalColor nSalColor );
     virtual void            SetFillColor();
 
-    virtual void            SetFillColor( SalColor nSalColor );
+    virtual void                        SetFillColor( SalColor nSalColor );
 
     virtual void            SetXORMode( bool bSet, bool );
 
@@ -85,14 +85,14 @@ public:
     virtual void            SetROPFillColor( SalROPColor nROPColor );
 
     virtual void            SetTextColor( SalColor nSalColor );
-    virtual USHORT         SetFont( ImplFontSelectData*, int nFallbackLevel );
+    virtual sal_uInt16                  SetFont( ImplFontSelectData*, int nFallbackLevel );
     virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel );
-    virtual ULONG           GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs );
+    virtual sal_uLong           GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs );
     virtual const ImplFontCharMap* GetImplFontCharMap() const;
     virtual void            GetDevFontList( ImplDevFontList* );
     virtual void            GetDevFontSubstList( OutputDevice* );
     virtual bool            AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
-    virtual BOOL            CreateFontSubset( const rtl::OUString& rToFile,
+    virtual sal_Bool            CreateFontSubset( const rtl::OUString& rToFile,
                                               const ImplFontData*,
                                               sal_Int32* pGlyphIDs,
                                               sal_uInt8* pEncoding,
@@ -111,8 +111,8 @@ public:
                                             bool bVertical,
                                             Int32Vector& rWidths,
                                             Ucs2UIntMap& rUnicodeEnc );
-    virtual BOOL            GetGlyphBoundRect( long nIndex, Rectangle& );
-    virtual BOOL            GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
+    virtual sal_Bool            GetGlyphBoundRect( long nIndex, Rectangle& );
+    virtual sal_Bool            GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
     virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
     virtual void            DrawServerFontLayout( const ServerFontLayout& );
     virtual bool            supportsOperation( OutDevSupportType ) const;
@@ -122,21 +122,21 @@ public:
     virtual void            drawRect( long nX, long nY, long nWidth, long nHeight );
     virtual bool            drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
     virtual bool            drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin );
-    virtual void            drawPolyLine( ULONG nPoints, const SalPoint* pPtAry );
-    virtual void            drawPolygon( ULONG nPoints, const SalPoint* pPtAry );
+    virtual void            drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry );
+    virtual void            drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry );
     virtual void            drawPolyPolygon( sal_uInt32 nPoly,
                                              const sal_uInt32* pPoints,
                                              PCONSTSALPOINT* pPtAry );
-    virtual sal_Bool        drawPolyLineBezier( ULONG nPoints,
+    virtual sal_Bool        drawPolyLineBezier( sal_uLong nPoints,
                                                 const SalPoint* pPtAry,
-                                                const BYTE* pFlgAry );
-    virtual sal_Bool        drawPolygonBezier( ULONG nPoints,
+                                                const sal_uInt8* pFlgAry );
+    virtual sal_Bool        drawPolygonBezier( sal_uLong nPoints,
                                                const SalPoint* pPtAry,
-                                               const BYTE* pFlgAry );
+                                               const sal_uInt8* pFlgAry );
     virtual sal_Bool        drawPolyPolygonBezier( sal_uInt32 nPoly,
                                                    const sal_uInt32* pPoints,
                                                    const SalPoint* const* pPtAry,
-                                                   const BYTE* const* pFlgAry );
+                                                   const sal_uInt8* const* pFlgAry );
 
     virtual void            copyArea( long nDestX,
                                       long nDestY,
@@ -144,7 +144,7 @@ public:
                                       long nSrcY,
                                       long nSrcWidth,
                                       long nSrcHeight,
-                                      USHORT nFlags );
+                                      sal_uInt16 nFlags );
     virtual void            copyBits( const SalTwoRect* pPosAry,
                                       SalGraphics* pSrcGraphics );
     virtual void            drawBitmap( const SalTwoRect* pPosAry,
@@ -161,9 +161,9 @@ public:
     virtual SalBitmap*      getBitmap( long nX, long nY, long nWidth, long nHeight );
     virtual SalColor        getPixel( long nX, long nY );
     virtual void            invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags );
-    virtual void            invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+    virtual void            invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags );
 
-    virtual BOOL            drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
+    virtual sal_Bool            drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize );
 
     virtual SystemGraphicsData GetGraphicsData() const;
     virtual SystemFontData     GetSysFontData( int nFallbacklevel ) const;
diff --git a/vcl/unx/headless/svpinst.cxx b/vcl/unx/headless/svpinst.cxx
index 09e359ca3f71..bce609b95035 100644
--- a/vcl/unx/headless/svpinst.cxx
+++ b/vcl/unx/headless/svpinst.cxx
@@ -122,7 +122,7 @@ SvpSalInstance::~SvpSalInstance()
     osl_destroyMutex( m_aEventGuard );
 }
 
-void SvpSalInstance::PostEvent( const SalFrame* pFrame, void* pData, USHORT nEvent )
+void SvpSalInstance::PostEvent( const SalFrame* pFrame, void* pData, sal_uInt16 nEvent )
 {
     if( osl_acquireMutex( m_aEventGuard ) )
     {
@@ -132,7 +132,7 @@ void SvpSalInstance::PostEvent( const SalFrame* pFrame, void* pData, USHORT nEve
     Wakeup();
 }
 
-void SvpSalInstance::CancelEvent( const SalFrame* pFrame, void* pData, USHORT nEvent )
+void SvpSalInstance::CancelEvent( const SalFrame* pFrame, void* pData, sal_uInt16 nEvent )
 {
     if( osl_acquireMutex( m_aEventGuard ) )
     {
@@ -192,7 +192,7 @@ inline int operator >= ( const timeval &t1, const timeval &t2 )
         return t1.tv_usec >= t2.tv_usec;
     return t1.tv_sec > t2.tv_sec;
 }
-inline timeval &operator += ( timeval &t1, ULONG t2 )
+inline timeval &operator += ( timeval &t1, sal_uLong t2 )
 {
     t1.tv_sec  += t2 / 1000;
     t1.tv_usec += t2 ? (t2 % 1000) * 1000 : 500;
@@ -235,12 +235,12 @@ bool SvpSalInstance::CheckTimeout( bool bExecuteTimers )
     return bRet;
 }
 
-SalFrame* SvpSalInstance::CreateChildFrame( SystemParentData* pParent, ULONG nStyle )
+SalFrame* SvpSalInstance::CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle )
 {
     return new SvpSalFrame( this, NULL, nStyle, pParent );
 }
 
-SalFrame* SvpSalInstance::CreateFrame( SalFrame* pParent, ULONG nStyle )
+SalFrame* SvpSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nStyle )
 {
     return new SvpSalFrame( this, pParent, nStyle );
 }
@@ -250,7 +250,7 @@ void SvpSalInstance::DestroyFrame( SalFrame* pFrame )
     delete pFrame;
 }
 
-SalObject* SvpSalInstance::CreateObject( SalFrame*, SystemWindowData*, BOOL )
+SalObject* SvpSalInstance::CreateObject( SalFrame*, SystemWindowData*, sal_Bool )
 {
     return new SvpSalObject();
 }
@@ -262,7 +262,7 @@ void SvpSalInstance::DestroyObject( SalObject* pObject )
 
 SalVirtualDevice* SvpSalInstance::CreateVirtualDevice( SalGraphics*,
                                                        long nDX, long nDY,
-                                                       USHORT nBitCount, const SystemGraphicsData* )
+                                                       sal_uInt16 nBitCount, const SystemGraphicsData* )
 {
     SvpSalVirtualDevice* pNew = new SvpSalVirtualDevice( nBitCount );
     pNew->SetSize( nDX, nDY );
@@ -299,13 +299,13 @@ vos::IMutex* SvpSalInstance::GetYieldMutex()
     return &m_aYieldMutex;
 }
 
-ULONG SvpSalInstance::ReleaseYieldMutex()
+sal_uLong SvpSalInstance::ReleaseYieldMutex()
 {
     if ( m_aYieldMutex.GetThreadId() ==
          vos::OThread::getCurrentIdentifier() )
     {
-        ULONG nCount = m_aYieldMutex.GetAcquireCount();
-        ULONG n = nCount;
+        sal_uLong nCount = m_aYieldMutex.GetAcquireCount();
+        sal_uLong n = nCount;
         while ( n )
         {
             m_aYieldMutex.release();
@@ -318,7 +318,7 @@ ULONG SvpSalInstance::ReleaseYieldMutex()
         return 0;
 }
 
-void SvpSalInstance::AcquireYieldMutex( ULONG nCount )
+void SvpSalInstance::AcquireYieldMutex( sal_uLong nCount )
 {
     while ( nCount )
     {
@@ -346,7 +346,7 @@ void SvpSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
 
     // release yield mutex
     std::list< SalUserEvent > aEvents;
-    ULONG nAcquireCount = ReleaseYieldMutex();
+    sal_uLong nAcquireCount = ReleaseYieldMutex();
     if( osl_acquireMutex( m_aEventGuard ) )
     {
         if( ! m_aUserEvents.empty() )
@@ -425,7 +425,7 @@ void SvpSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
     }
 }
 
-bool SvpSalInstance::AnyInput( USHORT nType )
+bool SvpSalInstance::AnyInput( sal_uInt16 nType )
 {
     if( (nType & INPUT_TIMER) != 0 )
         return CheckTimeout( false );
@@ -497,7 +497,7 @@ void SvpSalInstance::StopTimer()
     m_nTimeoutMS        = 0;
 }
 
-void SvpSalInstance::StartTimer( ULONG nMS )
+void SvpSalInstance::StartTimer( sal_uLong nMS )
 {
     timeval Timeout (m_aTimeout); // previous timeout.
     gettimeofday (&m_aTimeout, 0);
@@ -525,7 +525,7 @@ void SvpSalTimer::Stop()
     m_pInstance->StopTimer();
 }
 
-void SvpSalTimer::Start( ULONG nMS )
+void SvpSalTimer::Start( sal_uLong nMS )
 {
     m_pInstance->StartTimer( nMS );
 }
diff --git a/vcl/unx/headless/svpinst.hxx b/vcl/unx/headless/svpinst.hxx
index 02d5e3fa9494..736916bbaced 100644
--- a/vcl/unx/headless/svpinst.hxx
+++ b/vcl/unx/headless/svpinst.hxx
@@ -49,7 +49,7 @@
 class SvpSalYieldMutex : public vos::OMutex
 {
 protected:
-    ULONG                                       mnCount;
+    sal_uLong                                       mnCount;
     vos::OThread::TThreadIdentifier mnThreadId;
 
 public:
@@ -59,7 +59,7 @@ public:
     virtual void                                release();
     virtual sal_Bool                            tryToAcquire();
 
-    ULONG                                       GetAcquireCount() const { return mnCount; }
+    sal_uLong                                       GetAcquireCount() const { return mnCount; }
     vos::OThread::TThreadIdentifier GetThreadId() const { return mnThreadId; }
 };
 
@@ -75,7 +75,7 @@ public:
     virtual ~SvpSalTimer();
 
     // overload all pure virtual methods
-    virtual void Start( ULONG nMS );
+    virtual void Start( sal_uLong nMS );
     virtual void Stop();
 };
 
@@ -86,7 +86,7 @@ class SvpSalFrame;
 class SvpSalInstance : public SalInstance
 {
     timeval             m_aTimeout;
-    ULONG               m_nTimeoutMS;
+    sal_uLong               m_nTimeoutMS;
     int                 m_pTimeoutFDS[2];
     SvpSalYieldMutex    m_aYieldMutex;
 
@@ -95,9 +95,9 @@ class SvpSalInstance : public SalInstance
     {
         const SalFrame*     m_pFrame;
         void*               m_pData;
-        USHORT             m_nEvent;
+        sal_uInt16         m_nEvent;
 
-        SalUserEvent( const SalFrame* pFrame, void* pData, USHORT nEvent = SALEVENT_USEREVENT )
+        SalUserEvent( const SalFrame* pFrame, void* pData, sal_uInt16 nEvent = SALEVENT_USEREVENT )
                 : m_pFrame( pFrame ),
                   m_pData( pData ),
                   m_nEvent( nEvent )
@@ -117,10 +117,10 @@ public:
     SvpSalInstance();
     virtual ~SvpSalInstance();
 
-    void PostEvent( const SalFrame* pFrame, void* pData, USHORT nEvent );
-    void CancelEvent( const SalFrame* pFrame, void* pData, USHORT nEvent );
+    void PostEvent( const SalFrame* pFrame, void* pData, sal_uInt16 nEvent );
+    void CancelEvent( const SalFrame* pFrame, void* pData, sal_uInt16 nEvent );
 
-    void StartTimer( ULONG nMS );
+    void StartTimer( sal_uLong nMS );
     void StopTimer();
     void Wakeup();
 
@@ -131,12 +131,12 @@ public:
     bool            CheckTimeout( bool bExecuteTimers = true );
 
     // Frame
-    virtual SalFrame*       CreateChildFrame( SystemParentData* pParent, ULONG nStyle );
-    virtual SalFrame*       CreateFrame( SalFrame* pParent, ULONG nStyle );
+    virtual SalFrame*       CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle );
+    virtual SalFrame*       CreateFrame( SalFrame* pParent, sal_uLong nStyle );
     virtual void            DestroyFrame( SalFrame* pFrame );
 
     // Object (System Child Window)
-    virtual SalObject*      CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE );
+    virtual SalObject*      CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True );
     virtual void            DestroyObject( SalObject* pObject );
 
     // VirtualDevice
@@ -145,7 +145,7 @@ public:
     // pData allows for using a system dependent graphics or device context
     virtual SalVirtualDevice*   CreateVirtualDevice( SalGraphics* pGraphics,
                                                      long nDX, long nDY,
-                                                     USHORT nBitCount, const SystemGraphicsData *pData = NULL );
+                                                     sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL );
     virtual void                DestroyVirtualDevice( SalVirtualDevice* pDevice );
 
     // Printer
@@ -174,15 +174,15 @@ public:
 
     // YieldMutex
     virtual vos::IMutex*    GetYieldMutex();
-    virtual ULONG           ReleaseYieldMutex();
-    virtual void            AcquireYieldMutex( ULONG nCount );
+    virtual sal_uLong           ReleaseYieldMutex();
+    virtual void            AcquireYieldMutex( sal_uLong nCount );
     virtual bool            CheckYieldMutex();
 
     // wait next event and dispatch
     // must returned by UserEvent (SalFrame::PostEvent)
     // and timer
     virtual void            Yield( bool bWait, bool bHandleAllCurrentEvents );
-    virtual bool            AnyInput( USHORT nType );
+    virtual bool            AnyInput( sal_uInt16 nType );
 
     // may return NULL to disable session management
     virtual SalSession*     CreateSalSession();
diff --git a/vcl/unx/headless/svpprn.cxx b/vcl/unx/headless/svpprn.cxx
index 5b461bb996ef..0c8a119806af 100644
--- a/vcl/unx/headless/svpprn.cxx
+++ b/vcl/unx/headless/svpprn.cxx
@@ -159,7 +159,7 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
     if( rData.getStreamBuffer( pBuffer, nBytes ) )
     {
         pJobSetup->mnDriverDataLen = nBytes;
-        pJobSetup->mpDriverData = (BYTE*)pBuffer;
+        pJobSetup->mpDriverData = (sal_uInt8*)pBuffer;
     }
     else
     {
@@ -518,9 +518,9 @@ void PspSalInfoPrinter::ReleaseGraphics( SalGraphics* pGraphics )
 
 // -----------------------------------------------------------------------
 
-BOOL PspSalInfoPrinter::Setup( SalFrame*, ImplJobSetup* )
+sal_Bool PspSalInfoPrinter::Setup( SalFrame*, ImplJobSetup* )
 {
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
@@ -530,7 +530,7 @@ BOOL PspSalInfoPrinter::Setup( SalFrame*, ImplJobSetup* )
 // data should be merged into the driver data
 // If pJobSetup->mpDriverData IS NULL, then the driver defaults
 // should be merged into the independent data
-BOOL PspSalInfoPrinter::SetPrinterData( ImplJobSetup* pJobSetup )
+sal_Bool PspSalInfoPrinter::SetPrinterData( ImplJobSetup* pJobSetup )
 {
     if( pJobSetup->mpDriverData )
         return SetData( ~0, pJobSetup );
@@ -548,7 +548,7 @@ BOOL PspSalInfoPrinter::SetPrinterData( ImplJobSetup* pJobSetup )
     }
     m_aPrinterGfx.setStrictSO52Compatibility( bStrictSO52Compatibility );
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -557,8 +557,8 @@ BOOL PspSalInfoPrinter::SetPrinterData( ImplJobSetup* pJobSetup )
 // and sets the new independ data in pJobSetup
 // Only the data must be changed, where the bit
 // in nGetDataFlags is set
-BOOL PspSalInfoPrinter::SetData(
-    ULONG nSetDataFlags,
+sal_Bool PspSalInfoPrinter::SetData(
+    sal_uLong nSetDataFlags,
     ImplJobSetup* pJobSetup )
 {
     JobData aData;
@@ -595,7 +595,7 @@ BOOL PspSalInfoPrinter::SetData(
             pKey = aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "PageSize" ) ) );
             pValue = pKey ? pKey->getValue( aPaper ) : NULL;
             if( ! ( pKey && pValue && aData.m_aContext.setValue( pKey, pValue, false ) == pValue ) )
-                return FALSE;
+                return sal_False;
         }
 
         // merge paperbin if necessary
@@ -655,10 +655,10 @@ BOOL PspSalInfoPrinter::SetData(
 
         m_aJobData = aData;
         copyJobDataToJobSetup( pJobSetup, aData );
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
@@ -707,7 +707,7 @@ void PspSalInfoPrinter::GetPageInfo(
 
 // -----------------------------------------------------------------------
 
-ULONG PspSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup )
+sal_uLong PspSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup )
 {
     if( ! pJobSetup )
         return 0;
@@ -721,7 +721,7 @@ ULONG PspSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup )
 
 // -----------------------------------------------------------------------
 
-String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, ULONG nPaperBin )
+String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_uLong nPaperBin )
 {
     JobData aData;
     JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aData );
@@ -745,7 +745,7 @@ String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, ULONG
 
 // -----------------------------------------------------------------------
 
-ULONG PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, USHORT nType )
+sal_uLong PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, sal_uInt16 nType )
 {
     switch( nType )
     {
@@ -841,11 +841,11 @@ static String getTmpName()
     return aSys;
 }
 
-BOOL PspSalPrinter::StartJob(
+sal_Bool PspSalPrinter::StartJob(
     const XubString* pFileName,
     const XubString& rJobName,
     const XubString& rAppName,
-    ULONG nCopies,
+    sal_uLong nCopies,
     bool bCollate,
     bool /*bDirect*/,
     ImplJobSetup* pJobSetup )
@@ -920,14 +920,14 @@ BOOL PspSalPrinter::StartJob(
     }
     m_aPrinterGfx.setStrictSO52Compatibility( bStrictSO52Compatibility );
 
-    return m_aPrintJob.StartJob( m_aTmpFile.Len() ? m_aTmpFile : m_aFileName, nMode, rJobName, rAppName, m_aJobData, &m_aPrinterGfx, false ) ? TRUE : FALSE;
+    return m_aPrintJob.StartJob( m_aTmpFile.Len() ? m_aTmpFile : m_aFileName, nMode, rJobName, rAppName, m_aJobData, &m_aPrinterGfx, false ) ? sal_True : sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL PspSalPrinter::EndJob()
+sal_Bool PspSalPrinter::EndJob()
 {
-    BOOL bSuccess = m_aPrintJob.EndJob();
+    sal_Bool bSuccess = m_aPrintJob.EndJob();
 
     if( bSuccess )
     {
@@ -951,16 +951,16 @@ BOOL PspSalPrinter::EndJob()
 
 // -----------------------------------------------------------------------
 
-BOOL PspSalPrinter::AbortJob()
+sal_Bool PspSalPrinter::AbortJob()
 {
-    BOOL bAbort = m_aPrintJob.AbortJob() ? TRUE : FALSE;
+    sal_Bool bAbort = m_aPrintJob.AbortJob() ? sal_True : sal_False;
     vcl_sal::PrinterUpdate::jobEnded();
     return bAbort;
 }
 
 // -----------------------------------------------------------------------
 
-SalGraphics* PspSalPrinter::StartPage( ImplJobSetup* pJobSetup, BOOL )
+SalGraphics* PspSalPrinter::StartPage( ImplJobSetup* pJobSetup, sal_Bool )
 {
     JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, m_aJobData );
     m_pGraphics = new PspGraphics( &m_aJobData, &m_aPrinterGfx, m_bFax ? &m_aFaxNr : NULL, m_bSwallowFaxNo, m_pInfoPrinter  );
@@ -981,16 +981,16 @@ SalGraphics* PspSalPrinter::StartPage( ImplJobSetup* pJobSetup, BOOL )
 
 // -----------------------------------------------------------------------
 
-BOOL PspSalPrinter::EndPage()
+sal_Bool PspSalPrinter::EndPage()
 {
     sal_Bool bResult = m_aPrintJob.EndPage();
     m_aPrinterGfx.Clear();
-    return bResult ? TRUE : FALSE;
+    return bResult ? sal_True : sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-ULONG PspSalPrinter::GetErrorCode()
+sal_uLong PspSalPrinter::GetErrorCode()
 {
     return 0;
 }
diff --git a/vcl/unx/headless/svpprn.hxx b/vcl/unx/headless/svpprn.hxx
index 0da506076908..84dbf8277054 100644
--- a/vcl/unx/headless/svpprn.hxx
+++ b/vcl/unx/headless/svpprn.hxx
@@ -48,16 +48,16 @@ public:
     // overload all pure virtual methods
     virtual SalGraphics*            GetGraphics();
     virtual void                    ReleaseGraphics( SalGraphics* pGraphics );
-    virtual BOOL                    Setup( SalFrame* pFrame, ImplJobSetup* pSetupData );
-    virtual BOOL                    SetPrinterData( ImplJobSetup* pSetupData );
-    virtual BOOL                    SetData( ULONG nFlags, ImplJobSetup* pSetupData );
+    virtual sal_Bool                    Setup( SalFrame* pFrame, ImplJobSetup* pSetupData );
+    virtual sal_Bool                    SetPrinterData( ImplJobSetup* pSetupData );
+    virtual sal_Bool                    SetData( sal_uLong nFlags, ImplJobSetup* pSetupData );
     virtual void                    GetPageInfo( const ImplJobSetup* pSetupData,
                                                  long& rOutWidth, long& rOutHeight,
                                                  long& rPageOffX, long& rPageOffY,
                                                  long& rPageWidth, long& rPageHeight );
-    virtual ULONG                   GetCapabilities( const ImplJobSetup* pSetupData, USHORT nType );
-    virtual ULONG                   GetPaperBinCount( const ImplJobSetup* pSetupData );
-    virtual String                  GetPaperBinName( const ImplJobSetup* pSetupData, ULONG nPaperBin );
+    virtual sal_uLong                   GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType );
+    virtual sal_uLong                   GetPaperBinCount( const ImplJobSetup* pSetupData );
+    virtual String                  GetPaperBinName( const ImplJobSetup* pSetupData, sal_uLong nPaperBin );
     virtual void                    InitPaperFormats( const ImplJobSetup* pSetupData );
     virtual int                 GetLandscapeAngle( const ImplJobSetup* pSetupData );
 };
@@ -75,7 +75,7 @@ public:
     psp::PrinterJob         m_aPrintJob;
     psp::JobData            m_aJobData;
     psp::PrinterGfx         m_aPrinterGfx;
-    ULONG                   m_nCopies;
+    sal_uLong                   m_nCopies;
     bool                    m_bCollate;
     SalInfoPrinter*         m_pInfoPrinter;
 
@@ -84,18 +84,18 @@ public:
 
     // overload all pure virtual methods
     using SalPrinter::StartJob;
-    virtual BOOL                    StartJob( const XubString* pFileName,
+    virtual sal_Bool                    StartJob( const XubString* pFileName,
                                               const XubString& rJobName,
                                               const XubString& rAppName,
-                                              ULONG nCopies,
+                                              sal_uLong nCopies,
                                               bool bCollate,
                                               bool bDirect,
                                               ImplJobSetup* pSetupData );
-    virtual BOOL                    EndJob();
-    virtual BOOL                    AbortJob();
-    virtual SalGraphics*            StartPage( ImplJobSetup* pSetupData, BOOL bNewJobData );
-    virtual BOOL                    EndPage();
-    virtual ULONG                   GetErrorCode();
+    virtual sal_Bool                    EndJob();
+    virtual sal_Bool                    AbortJob();
+    virtual SalGraphics*            StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJobData );
+    virtual sal_Bool                    EndPage();
+    virtual sal_uLong                   GetErrorCode();
 };
 
 class Timer;
diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx
index c7b1f4f41fca..6fdc8aac75d0 100644
--- a/vcl/unx/headless/svppspgraphics.cxx
+++ b/vcl/unx/headless/svppspgraphics.cxx
@@ -204,7 +204,7 @@ void PspGraphics::GetResolution( sal_Int32 &rDPIX, sal_Int32 &rDPIY )
     }
 }
 
-USHORT PspGraphics::GetBitCount()
+sal_uInt16 PspGraphics::GetBitCount()
 {
     return m_pPrinterGfx->GetBitCount();
 }
@@ -219,14 +219,14 @@ void PspGraphics::ResetClipRegion()
     m_pPrinterGfx->ResetClipRegion ();
 }
 
-void PspGraphics::BeginSetClipRegion( ULONG n )
+void PspGraphics::BeginSetClipRegion( sal_uLong n )
 {
     m_pPrinterGfx->BeginSetClipRegion(n);
 }
 
-BOOL PspGraphics::unionClipRegion( long nX, long nY, long nDX, long nDY )
+sal_Bool PspGraphics::unionClipRegion( long nX, long nY, long nDX, long nDY )
 {
-    return (BOOL)m_pPrinterGfx->UnionClipRegion (nX, nY, nDX, nDY);
+    return (sal_Bool)m_pPrinterGfx->UnionClipRegion (nX, nY, nDX, nDY);
 }
 
 bool PspGraphics::unionClipRegion( const ::basegfx::B2DPolyPolygon& )
@@ -305,12 +305,12 @@ void PspGraphics::drawRect( long nX, long nY, long nDX, long nDY )
     m_pPrinterGfx->DrawRect (Rectangle(Point(nX, nY), Size(nDX, nDY)));
 }
 
-void PspGraphics::drawPolyLine( ULONG nPoints, const SalPoint *pPtAry )
+void PspGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry )
 {
     m_pPrinterGfx->DrawPolyLine (nPoints, (Point*)pPtAry);
 }
 
-void PspGraphics::drawPolygon( ULONG nPoints, const SalPoint* pPtAry )
+void PspGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
 {
     // Point must be equal to SalPoint! see vcl/inc/salgtype.hxx
     m_pPrinterGfx->DrawPolygon (nPoints, (Point*)pPtAry);
@@ -329,13 +329,13 @@ bool PspGraphics::drawPolyLine( const ::basegfx::B2DPolygon&, double /*fTranspar
         return false;
 }
 
-sal_Bool PspGraphics::drawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry )
+sal_Bool PspGraphics::drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
 {
     m_pPrinterGfx->DrawPolyLineBezier (nPoints, (Point*)pPtAry, pFlgAry);
     return sal_True;
 }
 
-sal_Bool PspGraphics::drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry )
+sal_Bool PspGraphics::drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
 {
     m_pPrinterGfx->DrawPolygonBezier (nPoints, (Point*)pPtAry, pFlgAry);
     return sal_True;
@@ -344,10 +344,10 @@ sal_Bool PspGraphics::drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry,
 sal_Bool PspGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly,
                                              const sal_uInt32* pPoints,
                                              const SalPoint* const* pPtAry,
-                                             const BYTE* const* pFlgAry )
+                                             const sal_uInt8* const* pFlgAry )
 {
     // Point must be equal to SalPoint! see vcl/inc/salgtype.hxx
-    m_pPrinterGfx->DrawPolyPolygonBezier (nPoly, pPoints, (Point**)pPtAry, (BYTE**)pFlgAry);
+    m_pPrinterGfx->DrawPolyPolygonBezier (nPoly, pPoints, (Point**)pPtAry, (sal_uInt8**)pFlgAry);
     return sal_True;
 }
 
@@ -357,13 +357,13 @@ bool PspGraphics::drawPolyPolygon( const basegfx::B2DPolyPolygon&, double /*fTra
     return false;
 }
 
-void PspGraphics::invert( ULONG /*nPoints*/,
+void PspGraphics::invert( sal_uLong /*nPoints*/,
                           const SalPoint* /*pPtAry*/,
                           SalInvert /*nFlags*/ )
 {
     DBG_ASSERT( 0, "Error: PrinterGfx::Invert() not implemented" );
 }
-BOOL PspGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize )
+sal_Bool PspGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize )
 {
     return m_pPrinterGfx->DrawEPS( Rectangle( Point( nX, nY ), Size( nWidth, nHeight ) ), pPtr, nSize );
 }
@@ -377,7 +377,7 @@ void PspGraphics::copyBits( const SalTwoRect* /*pPosAry*/,
 void PspGraphics::copyArea ( long /*nDestX*/,    long /*nDestY*/,
                              long /*nSrcX*/,     long /*nSrcY*/,
                              long /*nSrcWidth*/, long /*nSrcHeight*/,
-                             USHORT /*nFlags*/ )
+                             sal_uInt16 /*nFlags*/ )
 {
     DBG_ERROR( "Error: PrinterGfx::CopyArea() not implemented" );
 }
@@ -692,7 +692,7 @@ const ImplFontCharMap* PspGraphics::GetImplFontCharMap() const
     return pIFCMap;
 }
 
-USHORT PspGraphics::SetFont( ImplFontSelectData *pEntry, int nFallbackLevel )
+sal_uInt16 PspGraphics::SetFont( ImplFontSelectData *pEntry, int nFallbackLevel )
 {
     // release all fonts that are to be overridden
     for( int i = nFallbackLevel; i < MAX_FALLBACK; ++i )
@@ -817,10 +817,10 @@ void PspGraphics::GetFontMetric( ImplFontMetricData *pMetric, int )
     }
 }
 
-ULONG PspGraphics::GetKernPairs( ULONG nPairs, ImplKernPairData *pKernPairs )
+sal_uLong PspGraphics::GetKernPairs( sal_uLong nPairs, ImplKernPairData *pKernPairs )
 {
     const ::std::list< ::psp::KernPair >& rPairs( m_pPrinterGfx->getKernPairs() );
-    ULONG nHavePairs = rPairs.size();
+    sal_uLong nHavePairs = rPairs.size();
     if( pKernPairs && nPairs )
     {
         ::std::list< ::psp::KernPair >::const_iterator it;
@@ -839,38 +839,38 @@ ULONG PspGraphics::GetKernPairs( ULONG nPairs, ImplKernPairData *pKernPairs )
     return nHavePairs;
 }
 
-BOOL PspGraphics::GetGlyphBoundRect( long nGlyphIndex, Rectangle& rRect )
+sal_Bool PspGraphics::GetGlyphBoundRect( long nGlyphIndex, Rectangle& rRect )
 {
     int nLevel = nGlyphIndex >> GF_FONTSHIFT;
     if( nLevel >= MAX_FALLBACK )
-        return FALSE;
+        return sal_False;
 
     ServerFont* pSF = m_pServerFont[ nLevel ];
     if( !pSF )
-        return FALSE;
+        return sal_False;
 
     nGlyphIndex &= ~GF_FONTMASK;
     const GlyphMetric& rGM = pSF->GetGlyphMetric( nGlyphIndex );
     rRect = Rectangle( rGM.GetOffset(), rGM.GetSize() );
-    return TRUE;
+    return sal_True;
 }
 
-BOOL PspGraphics::GetGlyphOutline( long nGlyphIndex,
+sal_Bool PspGraphics::GetGlyphOutline( long nGlyphIndex,
     ::basegfx::B2DPolyPolygon& rB2DPolyPoly )
 {
     int nLevel = nGlyphIndex >> GF_FONTSHIFT;
     if( nLevel >= MAX_FALLBACK )
-        return FALSE;
+        return sal_False;
 
     ServerFont* pSF = m_pServerFont[ nLevel ];
     if( !pSF )
-        return FALSE;
+        return sal_False;
 
     nGlyphIndex &= ~GF_FONTMASK;
     if( pSF->GetGlyphOutline( nGlyphIndex, rB2DPolyPoly ) )
-        return TRUE;
+        return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 SalLayout* PspGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel )
@@ -895,7 +895,7 @@ SalLayout* PspGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel
 
 //--------------------------------------------------------------------------
 
-BOOL PspGraphics::CreateFontSubset(
+sal_Bool PspGraphics::CreateFontSubset(
                                    const rtl::OUString& rToFile,
                                    const ImplFontData* pFont,
                                    sal_Int32* pGlyphIDs,
@@ -1281,9 +1281,9 @@ bool PspGraphics::filterText( const String& rOrig, String& rNewText, xub_StrLen
     bool bRet = false;
     bool bStarted = false;
     bool bStopped = false;
-    USHORT nPos;
-    USHORT nStart = 0;
-    USHORT nStop = rLen;
+    sal_uInt16 nPos;
+    sal_uInt16 nStart = 0;
+    sal_uInt16 nStop = rLen;
     String aPhone = rOrig.Copy( nIndex, rLen );
 
     if( ! m_bPhoneCollectionActive )
diff --git a/vcl/unx/headless/svppspgraphics.hxx b/vcl/unx/headless/svppspgraphics.hxx
index 138198239621..fe9352c1fd8b 100644
--- a/vcl/unx/headless/svppspgraphics.hxx
+++ b/vcl/unx/headless/svppspgraphics.hxx
@@ -86,12 +86,12 @@ public:
 
     // overload all pure virtual methods
     virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY );
-    virtual USHORT          GetBitCount();
+    virtual sal_uInt16          GetBitCount();
     virtual long            GetGraphicsWidth() const;
 
     virtual void            ResetClipRegion();
-    virtual void            BeginSetClipRegion( ULONG nCount );
-    virtual BOOL            unionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual void            BeginSetClipRegion( sal_uLong nCount );
+    virtual sal_Bool            unionClipRegion( long nX, long nY, long nWidth, long nHeight );
     virtual bool                        unionClipRegion(  const ::basegfx::B2DPolyPolygon& );
     virtual void            EndSetClipRegion();
 
@@ -104,14 +104,14 @@ public:
     virtual void            SetROPFillColor( SalROPColor nROPColor );
 
     virtual void            SetTextColor( SalColor nSalColor );
-    virtual USHORT          SetFont( ImplFontSelectData*, int nFallbackLevel );
+    virtual sal_uInt16          SetFont( ImplFontSelectData*, int nFallbackLevel );
     virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel );
-    virtual ULONG           GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs );
+    virtual sal_uLong           GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs );
     virtual const ImplFontCharMap* GetImplFontCharMap() const;
     virtual void            GetDevFontList( ImplDevFontList* );
     virtual void            GetDevFontSubstList( OutputDevice* );
     virtual bool            AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
-    virtual BOOL            CreateFontSubset( const rtl::OUString& rToFile,
+    virtual sal_Bool            CreateFontSubset( const rtl::OUString& rToFile,
                                               const ImplFontData*,
                                               sal_Int32* pGlyphIDs,
                                               sal_uInt8* pEncoding,
@@ -130,8 +130,8 @@ public:
                                             bool bVertical,
                                             Int32Vector& rWidths,
                                             Ucs2UIntMap& rUnicodeEnc );
-    virtual BOOL            GetGlyphBoundRect( long nIndex, Rectangle& );
-    virtual BOOL            GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
+    virtual sal_Bool            GetGlyphBoundRect( long nIndex, Rectangle& );
+    virtual sal_Bool            GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
     virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
     virtual void            DrawServerFontLayout( const ServerFontLayout& );
     virtual bool            supportsOperation( OutDevSupportType ) const;
@@ -139,23 +139,23 @@ public:
     virtual void            drawPixel( long nX, long nY, SalColor nSalColor );
     virtual void            drawLine( long nX1, long nY1, long nX2, long nY2 );
     virtual void            drawRect( long nX, long nY, long nWidth, long nHeight );
-    virtual void            drawPolyLine( ULONG nPoints, const SalPoint* pPtAry );
-    virtual void            drawPolygon( ULONG nPoints, const SalPoint* pPtAry );
+    virtual void            drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry );
+    virtual void            drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry );
     virtual bool            drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
     virtual bool            drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin );
     virtual void            drawPolyPolygon( sal_uInt32 nPoly,
                                              const sal_uInt32* pPoints,
                                              PCONSTSALPOINT* pPtAry );
-    virtual sal_Bool        drawPolyLineBezier( ULONG nPoints,
+    virtual sal_Bool        drawPolyLineBezier( sal_uLong nPoints,
                                                 const SalPoint* pPtAry,
-                                                const BYTE* pFlgAry );
-    virtual sal_Bool        drawPolygonBezier( ULONG nPoints,
+                                                const sal_uInt8* pFlgAry );
+    virtual sal_Bool        drawPolygonBezier( sal_uLong nPoints,
                                                const SalPoint* pPtAry,
-                                               const BYTE* pFlgAry );
+                                               const sal_uInt8* pFlgAry );
     virtual sal_Bool        drawPolyPolygonBezier( sal_uInt32 nPoly,
                                                    const sal_uInt32* pPoints,
                                                    const SalPoint* const* pPtAry,
-                                                   const BYTE* const* pFlgAry );
+                                                   const sal_uInt8* const* pFlgAry );
 
     virtual void            copyArea( long nDestX,
                                       long nDestY,
@@ -163,7 +163,7 @@ public:
                                       long nSrcY,
                                       long nSrcWidth,
                                       long nSrcHeight,
-                                      USHORT nFlags );
+                                      sal_uInt16 nFlags );
     virtual void            copyBits( const SalTwoRect* pPosAry,
                                       SalGraphics* pSrcGraphics );
     virtual void            drawBitmap( const SalTwoRect* pPosAry,
@@ -180,9 +180,9 @@ public:
     virtual SalBitmap*      getBitmap( long nX, long nY, long nWidth, long nHeight );
     virtual SalColor        getPixel( long nX, long nY );
     virtual void            invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags );
-    virtual void            invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+    virtual void            invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags );
 
-    virtual BOOL            drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
+    virtual sal_Bool            drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize );
     virtual bool            filterText( const String& rOrigText, String& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart, xub_StrLen& rCutStop );
 
     virtual SystemGraphicsData      GetGraphicsData() const;
diff --git a/vcl/unx/headless/svptext.cxx b/vcl/unx/headless/svptext.cxx
index dff1fd4d6ca7..fba7fe4bf31d 100644
--- a/vcl/unx/headless/svptext.cxx
+++ b/vcl/unx/headless/svptext.cxx
@@ -1,4 +1,4 @@
-/*************************************************************************
+#/*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -204,7 +204,7 @@ void PspKernInfo::Initialize() const
 
 // ===========================================================================
 
-USHORT SvpSalGraphics::SetFont( ImplFontSelectData* pIFSD, int nFallbackLevel )
+sal_uInt16 SvpSalGraphics::SetFont( ImplFontSelectData* pIFSD, int nFallbackLevel )
 {
     // release all no longer needed font resources
     for( int i = nFallbackLevel; i < MAX_FALLBACK; ++i )
@@ -254,15 +254,15 @@ void SvpSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLe
 
 // ---------------------------------------------------------------------------
 
-ULONG SvpSalGraphics::GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs )
+sal_uLong SvpSalGraphics::GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs )
 {
-    ULONG nGotPairs = 0;
+    sal_uLong nGotPairs = 0;
 
     if( m_pServerFont[0] != NULL )
     {
         ImplKernPairData* pTmpKernPairs = NULL;
         nGotPairs = m_pServerFont[0]->GetKernPairs( &pTmpKernPairs );
-        for( ULONG i = 0; i < nPairs && i < nGotPairs; ++i )
+        for( sal_uLong i = 0; i < nPairs && i < nGotPairs; ++i )
             pKernPairs[ i ] = pTmpKernPairs[ i ];
         delete[] pTmpKernPairs;
     }
@@ -339,7 +339,7 @@ bool SvpSalGraphics::AddTempDevFont( ImplDevFontList*,
 
 // ---------------------------------------------------------------------------
 
-BOOL SvpSalGraphics::CreateFontSubset(
+sal_Bool SvpSalGraphics::CreateFontSubset(
     const rtl::OUString& rToFile,
     const ImplFontData* pFont,
     sal_Int32* pGlyphIDs,
@@ -422,39 +422,39 @@ void SvpSalGraphics::GetGlyphWidths( const ImplFontData* pFont,
 
 // ---------------------------------------------------------------------------
 
-BOOL SvpSalGraphics::GetGlyphBoundRect( long nGlyphIndex, Rectangle& rRect )
+sal_Bool SvpSalGraphics::GetGlyphBoundRect( long nGlyphIndex, Rectangle& rRect )
 {
     int nLevel = nGlyphIndex >> GF_FONTSHIFT;
     if( nLevel >= MAX_FALLBACK )
-        return FALSE;
+        return sal_False;
 
     ServerFont* pSF = m_pServerFont[ nLevel ];
     if( !pSF )
-        return FALSE;
+        return sal_False;
 
     nGlyphIndex &= ~GF_FONTMASK;
     const GlyphMetric& rGM = pSF->GetGlyphMetric( nGlyphIndex );
     rRect = Rectangle( rGM.GetOffset(), rGM.GetSize() );
-    return TRUE;
+    return sal_True;
 }
 
 // ---------------------------------------------------------------------------
 
-BOOL SvpSalGraphics::GetGlyphOutline( long nGlyphIndex, B2DPolyPolygon& rPolyPoly )
+sal_Bool SvpSalGraphics::GetGlyphOutline( long nGlyphIndex, B2DPolyPolygon& rPolyPoly )
 {
     int nLevel = nGlyphIndex >> GF_FONTSHIFT;
     if( nLevel >= MAX_FALLBACK )
-        return FALSE;
+        return sal_False;
 
     const ServerFont* pSF = m_pServerFont[ nLevel ];
     if( !pSF )
-        return FALSE;
+        return sal_False;
 
     nGlyphIndex &= ~GF_FONTMASK;
     if( pSF->GetGlyphOutline( nGlyphIndex, rPolyPoly ) )
-        return TRUE;
+        return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 // ---------------------------------------------------------------------------
diff --git a/vcl/unx/headless/svpvd.cxx b/vcl/unx/headless/svpvd.cxx
index 1c2ab01ccca2..4afbaefbfe7c 100644
--- a/vcl/unx/headless/svpvd.cxx
+++ b/vcl/unx/headless/svpvd.cxx
@@ -54,7 +54,7 @@ void SvpSalVirtualDevice::ReleaseGraphics( SalGraphics* pGraphics )
     delete pGraphics;
 }
 
-BOOL SvpSalVirtualDevice::SetSize( long nNewDX, long nNewDY )
+sal_Bool SvpSalVirtualDevice::SetSize( long nNewDX, long nNewDY )
 {
     B2IVector aDevSize( nNewDX, nNewDY );
     if( aDevSize.getX() == 0 )
diff --git a/vcl/unx/headless/svpvd.hxx b/vcl/unx/headless/svpvd.hxx
index 083547cf19a9..784a2ad6f664 100644
--- a/vcl/unx/headless/svpvd.hxx
+++ b/vcl/unx/headless/svpvd.hxx
@@ -37,12 +37,12 @@ class SvpSalGraphics;
 
 class SvpSalVirtualDevice : public SalVirtualDevice, public SvpElement
 {
-    USHORT                              m_nBitCount;
+    sal_uInt16                          m_nBitCount;
     basebmp::BitmapDeviceSharedPtr      m_aDevice;
     std::list< SvpSalGraphics* >        m_aGraphics;
 
 public:
-    SvpSalVirtualDevice( USHORT nBitCount ) : SvpElement(), m_nBitCount(nBitCount) {}
+    SvpSalVirtualDevice( sal_uInt16 nBitCount ) : SvpElement(), m_nBitCount(nBitCount) {}
     virtual ~SvpSalVirtualDevice();
 
     // SvpElement
@@ -52,7 +52,7 @@ public:
     virtual SalGraphics*    GetGraphics();
     virtual void            ReleaseGraphics( SalGraphics* pGraphics );
 
-    virtual BOOL            SetSize( long nNewDX, long nNewDY );
+    virtual sal_Bool            SetSize( long nNewDX, long nNewDY );
     virtual void            GetSize( long& rWidth, long& rHeight );
 };
 
diff --git a/vcl/unx/inc/i18n_cb.hxx b/vcl/unx/inc/i18n_cb.hxx
index d2301c26a3b0..97fd7f1fb6c8 100644
--- a/vcl/unx/inc/i18n_cb.hxx
+++ b/vcl/unx/inc/i18n_cb.hxx
@@ -89,7 +89,7 @@ typedef struct {
     preedit_status_t        eState;
     preedit_text_t          aText;
     SalExtTextInputEvent    aInputEv;
-    std::vector< USHORT >   aInputFlags;
+    std::vector< sal_uInt16 >   aInputFlags;
 } preedit_data_t;
 
 #endif /* _SAL_I18N_CALLBACK_HXX */
diff --git a/vcl/unx/inc/i18n_ic.hxx b/vcl/unx/inc/i18n_ic.hxx
index 2fb97a00b6f2..977d7f3e3a6f 100644
--- a/vcl/unx/inc/i18n_ic.hxx
+++ b/vcl/unx/inc/i18n_ic.hxx
@@ -75,7 +75,7 @@ public:
     void HandleDestroyIM();
 
     int  HandleKeyEvent( XKeyEvent *pEvent, SalFrame *pFrame ); // unused
-    void EndExtTextInput( USHORT nFlags );                      // unused
+    void EndExtTextInput( sal_uInt16 nFlags );                      // unused
     int  CommitStringCallback( sal_Unicode* pText, sal_Size nLength );
     int  CommitKeyEvent( sal_Unicode* pText, sal_Size nLength );
     int  UpdateSpotLocation();
diff --git a/vcl/unx/inc/plugins/gtk/gtkframe.hxx b/vcl/unx/inc/plugins/gtk/gtkframe.hxx
index d47e5fb50fca..1ddc9e24e4f1 100644
--- a/vcl/unx/inc/plugins/gtk/gtkframe.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkframe.hxx
@@ -134,7 +134,7 @@ class GtkSalFrame : public SalFrame
         bool                            m_bFocused;
         bool                            m_bPreeditJustChanged;
         SalExtTextInputEvent            m_aInputEvent;
-        std::vector< USHORT >           m_aInputFlags;
+        std::vector< sal_uInt16 >           m_aInputFlags;
 
         IMHandler( GtkSalFrame* );
         ~IMHandler();
@@ -143,7 +143,7 @@ class GtkSalFrame : public SalFrame
         void            deleteIMContext();
         void            updateIMSpotLocation();
         void            setInputContext( SalInputContext* pContext );
-        void            endExtTextInput( USHORT nFlags );
+        void            endExtTextInput( sal_uInt16 nFlags );
         bool            handleKeyEvent( GdkEventKey* pEvent );
         void            focusChanged( bool bFocusIn );
 
@@ -167,7 +167,7 @@ class GtkSalFrame : public SalFrame
     GdkWindow*                      m_pForeignTopLevel;
     GdkNativeWindow                 m_aForeignTopLevelWindow;
     Pixmap                          m_hBackgroundPixmap;
-    ULONG                           m_nStyle;
+    sal_uLong                     m_nStyle;
     SalExtStyle                     m_nExtStyle;
     GtkFixed*                       m_pFixedContainer;
     GtkSalFrame*                    m_pParent;
@@ -175,7 +175,7 @@ class GtkSalFrame : public SalFrame
     GdkWindowState                  m_nState;
     SystemEnvData                   m_aSystemData;
     GraphicsHolder                  m_aGraphics[ nMaxGraphics ];
-    USHORT                          m_nKeyModifiers;
+    sal_uInt16                          m_nKeyModifiers;
     GdkCursor                      *m_pCurrentCursor;
     GdkVisibilityState              m_nVisibility;
     PointerStyle                    m_ePointerStyle;
@@ -199,7 +199,7 @@ class GtkSalFrame : public SalFrame
 
     GdkRegion*                      m_pRegion;
 
-    void Init( SalFrame* pParent, ULONG nStyle );
+    void Init( SalFrame* pParent, sal_uLong nStyle );
     void Init( SystemParentData* pSysData );
     void InitCommon();
 
@@ -251,7 +251,7 @@ class GtkSalFrame : public SalFrame
 
     bool isChild( bool bPlug = true, bool bSysChild = true )
     {
-        ULONG nMask = 0;
+        sal_uLong nMask = 0;
         if( bPlug )
             nMask |= SAL_FRAME_STYLE_PLUG;
         if( bSysChild )
@@ -270,14 +270,14 @@ class GtkSalFrame : public SalFrame
 
     DECL_LINK( ImplDelayedFullScreenHdl, void* );
 public:
-    GtkSalFrame( SalFrame* pParent, ULONG nStyle );
+    GtkSalFrame( SalFrame* pParent, sal_uLong nStyle );
     GtkSalFrame( SystemParentData* pSysData );
 
     // dispatches an event, returns true if dispatched
     // and false else; if true was returned the event should
     // be swallowed
     bool Dispatch( const XEvent* pEvent );
-    void grabPointer( BOOL bGrab, BOOL bOwnerEvents = FALSE );
+    void grabPointer( sal_Bool bGrab, sal_Bool bOwnerEvents = sal_False );
 
     GtkSalDisplay*  getDisplay();
     GdkDisplay*     getGdkDisplay();
@@ -304,41 +304,41 @@ public:
 
     // Event must be destroyed, when Frame is destroyed
     // When Event is called, SalInstance::Yield() must be returned
-    virtual BOOL                PostEvent( void* pData );
+    virtual sal_Bool                PostEvent( void* pData );
 
     virtual void                SetTitle( const XubString& rTitle );
-    virtual void                SetIcon( USHORT nIcon );
+    virtual void                SetIcon( sal_uInt16 nIcon );
     virtual void                SetMenu( SalMenu *pSalMenu );
     virtual void                DrawMenuBar();
 
     virtual void                SetExtendedFrameStyle( SalExtStyle nExtStyle );
     // Before the window is visible, a resize event
     // must be sent with the correct size
-    virtual void                Show( BOOL bVisible, BOOL bNoActivate = FALSE );
-    virtual void                Enable( BOOL bEnable );
+    virtual void                Show( sal_Bool bVisible, sal_Bool bNoActivate = sal_False );
+    virtual void                Enable( sal_Bool bEnable );
     // Set ClientSize and Center the Window to the desktop
     // and send/post a resize message
     virtual void                SetMinClientSize( long nWidth, long nHeight );
     virtual void                SetMaxClientSize( long nWidth, long nHeight );
-    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, USHORT nFlags );
+    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags );
     virtual void                GetClientSize( long& rWidth, long& rHeight );
     virtual void                GetWorkArea( Rectangle& rRect );
     virtual SalFrame*           GetParent() const;
     virtual void                SetWindowState( const SalFrameState* pState );
-    virtual BOOL                GetWindowState( SalFrameState* pState );
-    virtual void                ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay );
+    virtual sal_Bool                GetWindowState( SalFrameState* pState );
+    virtual void                ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay );
     // Enable/Disable ScreenSaver, SystemAgents, ...
-    virtual void                StartPresentation( BOOL bStart );
+    virtual void                StartPresentation( sal_Bool bStart );
     // Show Window over all other Windows
-    virtual void                SetAlwaysOnTop( BOOL bOnTop );
+    virtual void                SetAlwaysOnTop( sal_Bool bOnTop );
 
     // Window to top and grab focus
-    virtual void                ToTop( USHORT nFlags );
+    virtual void                ToTop( sal_uInt16 nFlags );
 
     // this function can call with the same
     // pointer style
     virtual void                SetPointer( PointerStyle ePointerStyle );
-    virtual void                CaptureMouse( BOOL bMouse );
+    virtual void                CaptureMouse( sal_Bool bMouse );
     virtual void                SetPointerPos( long nX, long nY );
 
     // flush output buffer
@@ -348,11 +348,11 @@ public:
     virtual void                Sync();
 
     virtual void                SetInputContext( SalInputContext* pContext );
-    virtual void                EndExtTextInput( USHORT nFlags );
+    virtual void                EndExtTextInput( sal_uInt16 nFlags );
 
-    virtual String              GetKeyName( USHORT nKeyCode );
-    virtual String              GetSymbolKeyName( const XubString& rFontName, USHORT nKeyCode );
-    virtual BOOL                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
+    virtual String              GetKeyName( sal_uInt16 nKeyCode );
+    virtual String              GetSymbolKeyName( const XubString& rFontName, sal_uInt16 nKeyCode );
+    virtual sal_Bool            MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
 
     // returns the input language used for the last key stroke
     // may be LANGUAGE_DONTKNOW if not supported by the OS
@@ -386,7 +386,7 @@ public:
     // set clip region to none (-> rectangular windows, normal state)
     virtual void                    ResetClipRegion();
     // start setting the clipregion consisting of nRects rectangles
-    virtual void                    BeginSetClipRegion( ULONG nRects );
+    virtual void                    BeginSetClipRegion( sal_uLong nRects );
     // add a rectangle to the clip region
     virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
     // done setting up the clipregion
diff --git a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx b/vcl/unx/inc/plugins/gtk/gtkgdi.hxx
index 38c79b3e11df..0b4439e6881f 100644
--- a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkgdi.hxx
@@ -55,23 +55,23 @@ public:
 
 
     // will be set when UI theme was changed
-    static  BOOL        bThemeChanged;
-    static  BOOL        bNeedPixmapPaint;
-    static  BOOL        bGlobalNeedPixmapPaint;
-    static  BOOL        bToolbarGripWorkaround;
-    static  BOOL        bNeedButtonStyleAsEditBackgroundWorkaround;
+    static  sal_Bool        bThemeChanged;
+    static  sal_Bool        bNeedPixmapPaint;
+    static  sal_Bool        bGlobalNeedPixmapPaint;
+    static  sal_Bool        bToolbarGripWorkaround;
+    static  sal_Bool        bNeedButtonStyleAsEditBackgroundWorkaround;
 
     // native widget methods
-    virtual BOOL        IsNativeControlSupported( ControlType nType, ControlPart nPart );
-    virtual BOOL        hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
-                                              const Point& aPos, BOOL& rIsInside );
-    virtual BOOL        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
+    virtual sal_Bool        IsNativeControlSupported( ControlType nType, ControlPart nPart );
+    virtual sal_Bool        hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
+                                              const Point& aPos, sal_Bool& rIsInside );
+    virtual sal_Bool        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                            ControlState nState, const ImplControlValue& aValue,
                                            const rtl::OUString& rCaption );
-    virtual BOOL        drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
+    virtual sal_Bool        drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                                ControlState nState, const ImplControlValue& aValue,
                                                const rtl::OUString& rCaption );
-    virtual BOOL        getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
+    virtual sal_Bool        getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
                                                 const ImplControlValue& aValue, const rtl::OUString& rCaption,
                                                 Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
 
@@ -79,8 +79,8 @@ public:
     void updateSettings( AllSettings& rSettings );
 
     virtual void            ResetClipRegion();
-    virtual void            BeginSetClipRegion( ULONG nCount );
-    virtual BOOL            unionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual void            BeginSetClipRegion( sal_uLong nCount );
+    virtual sal_Bool            unionClipRegion( long nX, long nY, long nWidth, long nHeight );
     virtual bool            unionClipRegion(  const ::basegfx::B2DPolyPolygon& );
     virtual void            EndSetClipRegion();
 
@@ -95,85 +95,85 @@ protected:
     typedef std::list< Rectangle > clipList;
 
     GdkPixmap* NWGetPixmapFromScreen( Rectangle srcRect );
-    BOOL NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRect );
+    sal_Bool NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRect );
 
-    BOOL NWPaintGTKButton( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+    sal_Bool NWPaintGTKButton( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                            const Rectangle& rControlRectangle,
                            const clipList& rClipList,
                            ControlState nState, const ImplControlValue& aValue,
                            const OUString& rCaption );
-    BOOL NWPaintGTKRadio( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+    sal_Bool NWPaintGTKRadio( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                           const Rectangle& rControlRectangle,
                           const clipList& rClipList,
                           ControlState nState, const ImplControlValue& aValue,
                           const OUString& rCaption );
-    BOOL NWPaintGTKCheck( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+    sal_Bool NWPaintGTKCheck( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                           const Rectangle& rControlRectangle,
                           const clipList& rClipList,
                           ControlState nState, const ImplControlValue& aValue,
                           const OUString& rCaption );
-    BOOL NWPaintGTKScrollbar( ControlType nType, ControlPart nPart,
+    sal_Bool NWPaintGTKScrollbar( ControlType nType, ControlPart nPart,
                               const Rectangle& rControlRectangle,
                               const clipList& rClipList,
                               ControlState nState, const ImplControlValue& aValue,
                               const OUString& rCaption );
-    BOOL NWPaintGTKEditBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+    sal_Bool NWPaintGTKEditBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                             const Rectangle& rControlRectangle,
                             const clipList& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
-    BOOL NWPaintGTKSpinBox( ControlType nType, ControlPart nPart,
+    sal_Bool NWPaintGTKSpinBox( ControlType nType, ControlPart nPart,
                             const Rectangle& rControlRectangle,
                             const clipList& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
-    BOOL NWPaintGTKComboBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+    sal_Bool NWPaintGTKComboBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                              const Rectangle& rControlRectangle,
                              const clipList& rClipList,
                              ControlState nState, const ImplControlValue& aValue,
                              const OUString& rCaption );
-    BOOL NWPaintGTKTabItem( ControlType nType, ControlPart nPart,
+    sal_Bool NWPaintGTKTabItem( ControlType nType, ControlPart nPart,
                             const Rectangle& rControlRectangle,
                             const clipList& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
-    BOOL NWPaintGTKListBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+    sal_Bool NWPaintGTKListBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                             const Rectangle& rControlRectangle,
                             const clipList& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
 
-    BOOL NWPaintGTKToolbar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+    sal_Bool NWPaintGTKToolbar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                             const Rectangle& rControlRectangle,
                             const clipList& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
-    BOOL NWPaintGTKMenubar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+    sal_Bool NWPaintGTKMenubar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                             const Rectangle& rControlRectangle,
                             const clipList& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
-    BOOL NWPaintGTKPopupMenu( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+    sal_Bool NWPaintGTKPopupMenu( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                               const Rectangle& rControlRectangle,
                               const clipList& rClipList,
                               ControlState nState, const ImplControlValue& aValue,
                               const OUString& rCaption );
-    BOOL NWPaintGTKTooltip( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+    sal_Bool NWPaintGTKTooltip( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                             const Rectangle& rControlRectangle,
                             const clipList& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
-    BOOL NWPaintGTKProgress( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+    sal_Bool NWPaintGTKProgress( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                             const Rectangle& rControlRectangle,
                             const clipList& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
-    BOOL NWPaintGTKSlider( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+    sal_Bool NWPaintGTKSlider( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                            const Rectangle& rControlRectangle,
                            const clipList& rClipList,
                            ControlState nState, const ImplControlValue& aValue,
                            const OUString& rCaption );
-    BOOL NWPaintGTKListNode( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+    sal_Bool NWPaintGTKListNode( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
                             const Rectangle& rControlRectangle,
                             const clipList& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
diff --git a/vcl/unx/inc/plugins/gtk/gtkinst.hxx b/vcl/unx/inc/plugins/gtk/gtkinst.hxx
index ee07199cb266..a9f788831199 100644
--- a/vcl/unx/inc/plugins/gtk/gtkinst.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkinst.hxx
@@ -63,7 +63,7 @@ class GtkHookedYieldMutex : public GtkYieldMutex
 {
     virtual int      Grab()             { return 0; };
     virtual void     Ungrab(int )       {};
-    std::list<ULONG> aYieldStack;
+    std::list<sal_uLong> aYieldStack;
 public:
     GtkHookedYieldMutex();
     virtual void      acquire();
@@ -84,9 +84,9 @@ public:
     {}
     virtual ~GtkInstance();
 
-    virtual SalFrame*           CreateFrame( SalFrame* pParent, ULONG nStyle );
-    virtual SalFrame*           CreateChildFrame( SystemParentData* pParent, ULONG nStyle );
-    virtual SalObject*          CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE );
+    virtual SalFrame*           CreateFrame( SalFrame* pParent, sal_uLong nStyle );
+    virtual SalFrame*           CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle );
+    virtual SalObject*          CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True );
     virtual SalSystem*          CreateSalSystem();
     virtual void                AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
 };
diff --git a/vcl/unx/inc/plugins/gtk/gtkobject.hxx b/vcl/unx/inc/plugins/gtk/gtkobject.hxx
index 9d3f235b8894..67434f038617 100644
--- a/vcl/unx/inc/plugins/gtk/gtkobject.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkobject.hxx
@@ -44,19 +44,19 @@ class GtkSalObject : public SalObject
     static gboolean     signalFocus( GtkWidget*, GdkEventFocus*, gpointer );
     static void         signalDestroy( GtkObject*, gpointer );
 public:
-    GtkSalObject( GtkSalFrame* pParent, BOOL bShow = TRUE );
+    GtkSalObject( GtkSalFrame* pParent, sal_Bool bShow = sal_True );
     virtual ~GtkSalObject();
 
     // overload all pure virtual methods
      virtual void                   ResetClipRegion();
-    virtual USHORT                  GetClipRegionType();
-    virtual void                    BeginSetClipRegion( ULONG nRects );
+    virtual sal_uInt16              GetClipRegionType();
+    virtual void                    BeginSetClipRegion( sal_uLong nRects );
     virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
     virtual void                    EndSetClipRegion();
 
     virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight );
-    virtual void                    Show( BOOL bVisible );
-    virtual void                    Enable( BOOL nEnable );
+    virtual void                    Show( sal_Bool bVisible );
+    virtual void                    Enable( sal_Bool nEnable );
     virtual void                    GrabFocus();
 
     virtual void                    SetBackground();
diff --git a/vcl/unx/inc/plugins/kde/kdedata.hxx b/vcl/unx/inc/plugins/kde/kdedata.hxx
index a55471901283..210799493638 100644
--- a/vcl/unx/inc/plugins/kde/kdedata.hxx
+++ b/vcl/unx/inc/plugins/kde/kdedata.hxx
@@ -67,14 +67,14 @@ class KDESalFrame : public X11SalFrame
     GraphicsHolder m_aGraphics[ nMaxGraphics ];
 
 public:
-    KDESalFrame( SalFrame* pParent, ULONG nStyle );
+    KDESalFrame( SalFrame* pParent, sal_uLong );
     virtual ~KDESalFrame();
 
     virtual SalGraphics* GetGraphics();
     virtual void ReleaseGraphics( SalGraphics *pGraphics );
     virtual void updateGraphics( bool bClear );
     virtual void UpdateSettings( AllSettings& rSettings );
-    virtual void Show( BOOL bVisible, BOOL bNoActivate );
+    virtual void Show( sal_Bool bVisible, sal_Bool bNoActivate );
 };
 
 class KDESalInstance : public X11SalInstance
@@ -83,7 +83,7 @@ public:
     KDESalInstance( SalYieldMutex* pMutex )
             : X11SalInstance( pMutex ) {}
     virtual ~KDESalInstance() {}
-    virtual SalFrame* CreateFrame( SalFrame* pParent, ULONG nStyle );
+    virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle );
 };
 
 class KDEXLib : public SalXLib
diff --git a/vcl/unx/inc/pspgraphics.h b/vcl/unx/inc/pspgraphics.h
index d4f5a9f156e0..143c628eb178 100644
--- a/vcl/unx/inc/pspgraphics.h
+++ b/vcl/unx/inc/pspgraphics.h
@@ -83,12 +83,12 @@ public:
 
     // overload all pure virtual methods
     virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY );
-    virtual USHORT          GetBitCount();
+    virtual sal_uInt16          GetBitCount();
     virtual long            GetGraphicsWidth() const;
 
     virtual void            ResetClipRegion();
-    virtual void            BeginSetClipRegion( ULONG nCount );
-    virtual BOOL            unionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual void            BeginSetClipRegion( sal_uIntPtr nCount );
+    virtual sal_Bool            unionClipRegion( long nX, long nY, long nWidth, long nHeight );
     virtual bool            unionClipRegion( const ::basegfx::B2DPolyPolygon& );
     virtual void            EndSetClipRegion();
 
@@ -101,14 +101,14 @@ public:
     virtual void            SetROPFillColor( SalROPColor nROPColor );
 
     virtual void            SetTextColor( SalColor nSalColor );
-    virtual USHORT          SetFont( ImplFontSelectData*, int nFallbackLevel );
+    virtual sal_uInt16          SetFont( ImplFontSelectData*, int nFallbackLevel );
     virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel );
-    virtual ULONG           GetKernPairs( ULONG nMaxPairs, ImplKernPairData* );
+    virtual sal_uLong           GetKernPairs( sal_uLong nMaxPairs, ImplKernPairData* );
     virtual const ImplFontCharMap* GetImplFontCharMap() const;
     virtual void            GetDevFontList( ImplDevFontList* );
     virtual void            GetDevFontSubstList( OutputDevice* );
     virtual bool            AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
-    virtual BOOL            CreateFontSubset( const rtl::OUString& rToFile,
+    virtual sal_Bool            CreateFontSubset( const rtl::OUString& rToFile,
                                               const ImplFontData*,
                                               sal_Int32* pGlyphIDs,
                                               sal_uInt8* pEncoding,
@@ -127,8 +127,8 @@ public:
                                             bool bVertical,
                                             Int32Vector& rWidths,
                                             Ucs2UIntMap& rUnicodeEnc );
-    virtual BOOL            GetGlyphBoundRect( long nIndex, Rectangle& );
-    virtual BOOL            GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
+    virtual sal_Bool            GetGlyphBoundRect( long nIndex, Rectangle& );
+    virtual sal_Bool            GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
     virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
     virtual void            DrawServerFontLayout( const ServerFontLayout& );
     virtual bool            supportsOperation( OutDevSupportType ) const;
@@ -136,30 +136,30 @@ public:
     virtual void            drawPixel( long nX, long nY, SalColor nSalColor );
     virtual void            drawLine( long nX1, long nY1, long nX2, long nY2 );
     virtual void            drawRect( long nX, long nY, long nWidth, long nHeight );
-    virtual void            drawPolyLine( ULONG nPoints, const SalPoint* pPtAry );
-    virtual void            drawPolygon( ULONG nPoints, const SalPoint* pPtAry );
+    virtual void            drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry );
+    virtual void            drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry );
     virtual void            drawPolyPolygon( sal_uInt32 nPoly,
                                              const sal_uInt32* pPoints,
                                              PCONSTSALPOINT* pPtAry );
     virtual bool            drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
     virtual bool            drawPolyLine( const basegfx::B2DPolygon&, double fTransparency, const basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin);
-    virtual sal_Bool        drawPolyLineBezier( ULONG nPoints,
+    virtual sal_Bool        drawPolyLineBezier( sal_uIntPtr nPoints,
                                                 const SalPoint* pPtAry,
-                                                const BYTE* pFlgAry );
-    virtual sal_Bool        drawPolygonBezier( ULONG nPoints,
+                                                const sal_uInt8* pFlgAry );
+    virtual sal_Bool        drawPolygonBezier( sal_uIntPtr nPoints,
                                                const SalPoint* pPtAry,
-                                               const BYTE* pFlgAry );
+                                               const sal_uInt8* pFlgAry );
     virtual sal_Bool        drawPolyPolygonBezier( sal_uInt32 nPoly,
                                                    const sal_uInt32* pPoints,
                                                    const SalPoint* const* pPtAry,
-                                                   const BYTE* const* pFlgAry );
+                                                   const sal_uInt8* const* pFlgAry );
     virtual void            copyArea( long nDestX,
                                       long nDestY,
                                       long nSrcX,
                                       long nSrcY,
                                       long nSrcWidth,
                                       long nSrcHeight,
-                                      USHORT nFlags );
+                                      sal_uInt16 nFlags );
     virtual void            copyBits( const SalTwoRect* pPosAry,
                                       SalGraphics* pSrcGraphics );
     virtual void            drawBitmap( const SalTwoRect* pPosAry,
@@ -176,9 +176,9 @@ public:
     virtual SalBitmap*      getBitmap( long nX, long nY, long nWidth, long nHeight );
     virtual SalColor        getPixel( long nX, long nY );
     virtual void            invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags );
-    virtual void            invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+    virtual void            invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nFlags );
 
-    virtual BOOL            drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
+    virtual sal_Bool            drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize );
     virtual bool            filterText( const String& rOrigText, String& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart, xub_StrLen& rCutStop );
 
     virtual bool            drawAlphaBitmap( const SalTwoRect&,
diff --git a/vcl/unx/inc/salbmp.h b/vcl/unx/inc/salbmp.h
index 23e038f30ab1..121966345f75 100644
--- a/vcl/unx/inc/salbmp.h
+++ b/vcl/unx/inc/salbmp.h
@@ -51,7 +51,7 @@ class VCL_DLLPUBLIC X11SalBitmap : public SalBitmap
 private:
 
     static BitmapBuffer*        ImplCreateDIB( const Size& rSize,
-                                               USHORT nBitCount,
+                                               sal_uInt16 nBitCount,
                                                const BitmapPalette& rPal );
     static BitmapBuffer*        ImplCreateDIB( Drawable aDrawable,
                                                int nScreen,
@@ -62,7 +62,7 @@ private:
 public:
 
     static ImplSalBitmapCache*  mpCache;
-    static ULONG                mnCacheInstCount;
+    static sal_uIntPtr              mnCacheInstCount;
 
     static void                 ImplCreateCache();
     static void                 ImplDestroyCache();
@@ -103,18 +103,18 @@ public:
 
     // overload pure virtual methods
     virtual bool            Create( const Size& rSize,
-                            USHORT nBitCount,
+                            sal_uInt16 nBitCount,
                             const BitmapPalette& rPal );
     virtual bool            Create( const SalBitmap& rSalBmp );
     virtual bool            Create( const SalBitmap& rSalBmp,
                                     SalGraphics* pGraphics );
     virtual bool            Create( const SalBitmap& rSalBmp,
-                                    USHORT nNewBitCount );
+                                    sal_uInt16 nNewBitCount );
 
     virtual void            Destroy();
 
     virtual Size            GetSize() const;
-    virtual USHORT          GetBitCount() const;
+    virtual sal_uInt16          GetBitCount() const;
 
     virtual BitmapBuffer*   AcquireBuffer( bool bReadOnly );
     virtual void            ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly );
@@ -161,7 +161,7 @@ public:
     long            ImplGetWidth() const { return maTwoRect.mnDestWidth; }
     long            ImplGetHeight() const { return maTwoRect.mnDestHeight; }
     long            ImplGetDepth() const { return mnDepth; }
-    ULONG           ImplGetMemSize() const { return( ( maTwoRect.mnDestWidth * maTwoRect.mnDestHeight * mnDepth ) >> 3 ); }
+    sal_uIntPtr         ImplGetMemSize() const { return( ( maTwoRect.mnDestWidth * maTwoRect.mnDestHeight * mnDepth ) >> 3 ); }
     int             ImplGetScreen() const { return mnScreen; }
 
     bool            ImplMatches( int nScreen, long nDepth, const SalTwoRect& rTwoRect ) const;
@@ -178,14 +178,14 @@ class ImplSalBitmapCache
 private:
 
     List            maBmpList;
-    ULONG           mnTotalSize;
+    sal_uIntPtr         mnTotalSize;
 
 public:
 
                     ImplSalBitmapCache();
                     ~ImplSalBitmapCache();
 
-    void            ImplAdd( X11SalBitmap* pBmp, ULONG nMemSize = 0UL, ULONG nFlags = 0UL );
+    void            ImplAdd( X11SalBitmap* pBmp, sal_uIntPtr nMemSize = 0UL, sal_uIntPtr nFlags = 0UL );
     void            ImplRemove( X11SalBitmap* pBmp );
     void            ImplClear();
 };
diff --git a/vcl/unx/inc/saldata.hxx b/vcl/unx/inc/saldata.hxx
index 939437060750..42240237a5ec 100644
--- a/vcl/unx/inc/saldata.hxx
+++ b/vcl/unx/inc/saldata.hxx
@@ -58,7 +58,7 @@ typedef unsigned int pthread_t;
 class VCL_DLLPUBLIC X11SalData : public SalData
 {
 protected:
-            BOOL                bNoExceptions_;
+            sal_Bool                bNoExceptions_;
             SalXLib            *pXLib_;
             SalDisplay         *m_pSalDisplay;
             pthread_t           hMainThread_;
@@ -85,7 +85,7 @@ public:
     inline  SalXLib*        GetLib() const { return pXLib_; }
     inline  pthread_t       GetMainThread() const { return hMainThread_; }
 
-    void                    StartTimer( ULONG nMS );
+    void                    StartTimer( sal_uLong nMS );
     inline  void            StopTimer();
     void                    Timeout() const;
 
@@ -114,7 +114,7 @@ inline void X11SalData::XError( Display *pDisplay,  XErrorEvent *pEvent ) const
 
 class YieldMutexReleaser
 {
-    ULONG               m_nYieldCount;
+    sal_uLong               m_nYieldCount;
 public:
     inline YieldMutexReleaser();
     inline ~YieldMutexReleaser();
diff --git a/vcl/unx/inc/saldisp.hxx b/vcl/unx/inc/saldisp.hxx
index 89efad3cde4d..42d1f820acff 100644
--- a/vcl/unx/inc/saldisp.hxx
+++ b/vcl/unx/inc/saldisp.hxx
@@ -152,8 +152,8 @@ public:
 
             Pixel           GetTCPixel( SalColor nColor ) const;
             SalColor        GetTCColor( Pixel nPixel ) const;
-            BOOL            Convert( int &n0, int &n1, int &n2, int &n3 ); // 32bit
-             BOOL           Convert( int &n0, int &n1, int &n2 ); // 24bit
+            sal_Bool            Convert( int &n0, int &n1, int &n2, int &n3 ); // 32bit
+             sal_Bool           Convert( int &n0, int &n1, int &n2 ); // 24bit
 };
 
 // -=-= SalColormap =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -163,7 +163,7 @@ class SalColormap
     Colormap                m_hColormap;
     std::vector<SalColor>   m_aPalette;         // Pseudocolor
     SalVisual               m_aVisual;
-    std::vector<USHORT>     m_aLookupTable;     // Pseudocolor: 12bit reduction
+    std::vector<sal_uInt16>     m_aLookupTable;     // Pseudocolor: 12bit reduction
     Pixel                   m_nWhitePixel;
     Pixel                   m_nBlackPixel;
     Pixel                   m_nUsed;            // Pseudocolor
@@ -176,7 +176,7 @@ public:
                  Colormap           hColormap,
                  int                nScreen );
     SalColormap( const BitmapPalette &rpPalette );
-    SalColormap( USHORT             nDepth );
+    SalColormap( sal_uInt16             nDepth );
     SalColormap();
     ~SalColormap();
 
@@ -191,11 +191,11 @@ public:
     inline  int                 GetClass() const { return m_aVisual.GetClass(); }
     inline  int                 GetScreenNumber() const { return m_nScreen; }
 
-    BOOL            GetXPixels( XColor  &rColor,
+    sal_Bool            GetXPixels( XColor  &rColor,
                                 int      r,
                                 int      g,
                                 int      b ) const;
-    inline  BOOL            GetXPixel( XColor  &rColor,
+    inline  sal_Bool            GetXPixel( XColor  &rColor,
                                        int      r,
                                        int      g,
                                        int      b ) const;
@@ -212,7 +212,7 @@ class VCL_DLLPUBLIC SalXLib
 {
 protected:
     timeval         m_aTimeout;
-    ULONG           m_nTimeoutMS;
+    sal_uLong           m_nTimeoutMS;
     int             m_pTimeoutFDS[2];
 
     bool            m_bHaveSystemChildFrames;
@@ -254,7 +254,7 @@ public:
     void PushXErrorLevel( bool bIgnore );
     void PopXErrorLevel();
 
-    virtual void            StartTimer( ULONG nMS );
+    virtual void            StartTimer( sal_uLong nMS );
     virtual void            StopTimer();
 
     bool            CheckTimeout( bool bExecuteTimers = true );
@@ -329,9 +329,9 @@ public:
     {
         SalFrame*       m_pFrame;
         void*           m_pData;
-        USHORT          m_nEvent;
+        sal_uInt16          m_nEvent;
 
-        SalUserEvent( SalFrame* pFrame, void* pData, USHORT nEvent = SALEVENT_USEREVENT )
+        SalUserEvent( SalFrame* pFrame, void* pData, sal_uInt16 nEvent = SALEVENT_USEREVENT )
                 : m_pFrame( pFrame ),
                   m_pData( pData ),
                   m_nEvent( nEvent )
@@ -351,14 +351,14 @@ protected:
     ScreenData      m_aInvalidScreenData;
     Pair            aResolution_;       // [dpi]
     bool            mbExactResolution;
-    ULONG           nMaxRequestSize_;   // [byte]
+    sal_uLong           nMaxRequestSize_;   // [byte]
 
     srv_vendor_t    meServerVendor;
     SalWM           eWindowManager_;
-    ULONG           nProperties_;       // PROPERTY_SUPPORT, BUG, FEATURE
-    BOOL            bLocal_;            // Server==Client? Init
+    sal_uLong           nProperties_;       // PROPERTY_SUPPORT, BUG, FEATURE
+    sal_Bool            bLocal_;            // Server==Client? Init
     // in SalDisplay::IsLocal()
-    BOOL            mbLocalIsValid;     // bLocal_ is valid ?
+    sal_Bool            mbLocalIsValid;     // bLocal_ is valid ?
     // until x bytes
 
     oslMutex        hEventGuard_;
@@ -368,7 +368,7 @@ protected:
     SalFrame*       m_pCapture;
 
     // Keyboard
-    BOOL            bNumLockFromXS_;    // Num Lock handled by X Server
+    sal_Bool            bNumLockFromXS_;    // Num Lock handled by X Server
     int             nNumLockIndex_;     // modifier index in modmap
     int             nNumLockMask_;      // keyevent state mask for
     KeySym          nShiftKeySym_;      // first shift modifier
@@ -398,7 +398,7 @@ protected:
     int             addXineramaScreenUnique( long i_nX, long i_nY, long i_nWidth, long i_nHeight );
 public:
     static  SalDisplay     *GetSalDisplay( Display* display );
-    static  BOOL            BestVisual( Display     *pDisp,
+    static  sal_Bool            BestVisual( Display     *pDisp,
                                         int          nScreen,
                                         XVisualInfo &rVI );
 
@@ -416,8 +416,8 @@ public:
 
     void            Init();
 
-    void            SendInternalEvent( SalFrame* pFrame, void* pData, USHORT nEvent = SALEVENT_USEREVENT );
-    void            CancelInternalEvent( SalFrame* pFrame, void* pData, USHORT nEvent );
+    void            SendInternalEvent( SalFrame* pFrame, void* pData, sal_uInt16 nEvent = SALEVENT_USEREVENT );
+    void            CancelInternalEvent( SalFrame* pFrame, void* pData, sal_uInt16 nEvent );
     bool            DispatchInternalEvent();
     void            PrintInfo() const;
 
@@ -428,8 +428,8 @@ public:
 
     void            ModifierMapping();
     String          GetKeyNameFromKeySym( KeySym keysym ) const;
-    XubString       GetKeyName( USHORT nKeyCode ) const;
-    USHORT          GetKeyCode( KeySym keysym, char*pcPrintable ) const;
+    XubString       GetKeyName( sal_uInt16 nKeyCode ) const;
+    sal_uInt16          GetKeyCode( KeySym keysym, char*pcPrintable ) const;
     KeySym          GetKeySym( XKeyEvent      *pEvent,
                                unsigned char  *pPrintable,
                                int            *pLen,
@@ -440,7 +440,7 @@ public:
     XLIB_Cursor     GetPointer( int ePointerStyle );
     virtual int CaptureMouse( SalFrame *pCapture );
 
-    BOOL            IsLocal();
+    sal_Bool            IsLocal();
 
     void            Remove( XEvent   *pEvent );
 
@@ -461,27 +461,27 @@ public:
     const Size&     GetScreenSize( int nScreen ) const { return getDataForScreen( nScreen ).m_aSize; }
     srv_vendor_t    GetServerVendor() const { return meServerVendor; }
     void            SetServerVendor() { meServerVendor = sal_GetServerVendor(pDisp_); }
-    BOOL            IsDisplay() const { return !!pXLib_; }
+    sal_Bool            IsDisplay() const { return !!pXLib_; }
     GC              GetMonoGC( int nScreen ) const { return getDataForScreen(nScreen).m_aMonoGC; }
     GC              GetCopyGC( int nScreen ) const { return getDataForScreen(nScreen).m_aCopyGC; }
     GC              GetAndInvertedGC( int nScreen ) const { return getDataForScreen(nScreen).m_aAndInvertedGC; }
     GC              GetAndGC( int nScreen ) const { return getDataForScreen(nScreen).m_aAndGC; }
     GC              GetOrGC( int nScreen ) const { return getDataForScreen(nScreen).m_aOrGC; }
     GC              GetStippleGC( int nScreen ) const { return getDataForScreen(nScreen).m_aStippleGC; }
-    GC              GetGC( USHORT nDepth, int nScreen ) const;
+    GC              GetGC( sal_uInt16 nDepth, int nScreen ) const;
     Pixmap          GetInvert50( int nScreen ) const { return getDataForScreen(nScreen).m_hInvert50; }
     const SalColormap&    GetColormap( int nScreen ) const { return getDataForScreen(nScreen).m_aColormap; }
     const SalVisual&      GetVisual( int nScreen ) const { return getDataForScreen(nScreen).m_aVisual; }
     RenderEntryMap&       GetRenderEntries( int nScreen ) const { return getDataForScreen(nScreen).m_aRenderData; }
     const Pair     &GetResolution() const { return aResolution_; }
     bool            GetExactResolution() const { return mbExactResolution; }
-    ULONG           GetProperties() const { return nProperties_; }
-    ULONG           GetMaxRequestSize() const { return nMaxRequestSize_; }
+    sal_uLong           GetProperties() const { return nProperties_; }
+    sal_uLong           GetMaxRequestSize() const { return nMaxRequestSize_; }
     XLIB_Time       GetLastUserEventTime( bool bAlwaysReget = false ) const;
 
     bool            XIfEventWithTimeout( XEvent*, XPointer, X_if_predicate, long i_nTimeout = 1000 ) const;
 
-    BOOL            MouseCaptured( const SalFrame *pFrameData ) const
+    sal_Bool            MouseCaptured( const SalFrame *pFrameData ) const
     { return m_pCapture == pFrameData; }
     SalFrame*   GetCaptureFrame() const
     { return m_pCapture; }
@@ -493,7 +493,7 @@ public:
     { mpInputMethod = pInputMethod; }
     void            SetKbdExtension(SalI18N_KeyboardExtension *pKbdExtension)
     { mpKbdExtension = pKbdExtension; }
-    const char* GetKeyboardName( BOOL bRefresh = FALSE );
+    const char* GetKeyboardName( sal_Bool bRefresh = sal_False );
     ::vcl_sal::WMAdaptor* getWMAdaptor() const { return m_pWMAdaptor; }
     DtIntegrator* getDtIntegrator() const { return m_pDtIntegrator; }
     bool            IsXinerama() const { return m_bXinerama; }
@@ -507,14 +507,14 @@ public:
     const std::list< SalFrame* >& getFrames() const
     { return m_aFrames; }
 
-    BOOL            IsNumLockFromXS() const { return bNumLockFromXS_; }
+    sal_Bool            IsNumLockFromXS() const { return bNumLockFromXS_; }
 
     std::list< SalObject* >& getSalObjects() { return m_aSalObjects; }
 };
 
 // -=-= inlines =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-inline GC SalDisplay::GetGC( USHORT nDepth, int nScreen ) const
+inline GC SalDisplay::GetGC( sal_uInt16 nDepth, int nScreen ) const
 { return 1 == nDepth
          ? GetMonoGC( nScreen )
          : getDataForScreen(nScreen).m_aVisual.GetDepth() == nDepth
@@ -533,7 +533,7 @@ public:
     virtual long        Dispatch( XEvent *pEvent );
     virtual void        Yield();
 
-    BOOL     IsEvent();
+    sal_Bool     IsEvent();
 };
 
 /*----------------------------------------------------------
diff --git a/vcl/unx/inc/salframe.h b/vcl/unx/inc/salframe.h
index 9786bac76f35..dde04b79f3ac 100644
--- a/vcl/unx/inc/salframe.h
+++ b/vcl/unx/inc/salframe.h
@@ -87,24 +87,24 @@ class VCL_DLLPUBLIC X11SalFrame : public SalFrame
     X11SalGraphics  *pFreeGraphics_;        // first free frame graphics
 
     XLIB_Time       nReleaseTime_;      // timestamp of last key release
-    USHORT          nKeyCode_;          // last key code
-    USHORT          nKeyState_;         // last key state
+    sal_uInt16          nKeyCode_;          // last key code
+    sal_uInt16          nKeyState_;         // last key state
     int             nCompose_;          // compose state
     bool            mbKeyMenu;
     bool            mbSendExtKeyModChange;
-    USHORT          mnExtKeyMod;
+    sal_uInt16          mnExtKeyMod;
 
     int             nShowState_;        // show state
     int             nWidth_;            // client width
     int             nHeight_;           // client height
     Rectangle       maRestorePosSize;
-    ULONG           nStyle_;
+    sal_uIntPtr         nStyle_;
     SalExtStyle     mnExtStyle;
-    BOOL            bAlwaysOnTop_;
-    BOOL            bViewable_;
-    BOOL            bMapped_;
-    BOOL            mbInShow;
-    BOOL            bDefaultPosition_;  // client is centered initially
+    sal_Bool            bAlwaysOnTop_;
+    sal_Bool            bViewable_;
+    sal_Bool            bMapped_;
+    sal_Bool            mbInShow;
+    sal_Bool            bDefaultPosition_;  // client is centered initially
     bool            m_bXEmbed;
     int             nVisibility_;
     int             m_nWorkArea;
@@ -172,11 +172,11 @@ class VCL_DLLPUBLIC X11SalFrame : public SalFrame
     void            setXEmbedInfo();
     void            askForXEmbedFocus( sal_Int32 i_nTimeCode );
 public:
-    X11SalFrame( SalFrame* pParent, ULONG nSalFrameStyle, SystemParentData* pSystemParent = NULL );
+    X11SalFrame( SalFrame* pParent, sal_uIntPtr nSalFrameStyle, SystemParentData* pSystemParent = NULL );
     virtual ~X11SalFrame();
 
     long            Dispatch( XEvent *pEvent );
-    void            Init( ULONG nSalFrameStyle, int nScreen = -1,
+    void            Init( sal_uIntPtr nSalFrameStyle, int nScreen = -1,
                           SystemParentData* pParentData = NULL, bool bUseGeometry = false );
 
     SalDisplay*             GetDisplay() const { return pDisplay_; }
@@ -189,10 +189,10 @@ public:
     XLIB_Window             GetStackingWindow() const { return mhStackingWindow; }
     long                    ShutDown() const { return CallCallback( SALEVENT_SHUTDOWN, 0 ); }
     long                    Close() const { return CallCallback( SALEVENT_CLOSE, 0 ); }
-              ULONG           GetStyle() const { return nStyle_; }
+              sal_uIntPtr           GetStyle() const { return nStyle_; }
 
     inline  XLIB_Cursor     GetCursor() const { return hCursor_; }
-    inline  BOOL            IsCaptured() const { return nCaptured_ == 1; }
+    inline  sal_Bool            IsCaptured() const { return nCaptured_ == 1; }
 #if !defined(__synchronous_extinput__)
     void            HandleExtTextEvent (XClientMessageEvent *pEvent);
     void            PostExtTextEvent (sal_uInt16 nExtTextEventType,
@@ -219,39 +219,39 @@ public:
     // call with false to setup graphics with window (GetWindow())
     virtual void                updateGraphics( bool bClear );
 
-    virtual BOOL                PostEvent( void* pData );
+    virtual sal_Bool                PostEvent( void* pData );
 
     virtual void                SetTitle( const XubString& rTitle );
-    virtual void                SetIcon( USHORT nIcon );
+    virtual void                SetIcon( sal_uInt16 nIcon );
     virtual void                SetMenu( SalMenu* pMenu );
     virtual void                                DrawMenuBar();
 
     virtual void                SetExtendedFrameStyle( SalExtStyle nExtStyle );
-    virtual void                Show( BOOL bVisible, BOOL bNoActivate = FALSE );
-    virtual void                Enable( BOOL bEnable );
+    virtual void                Show( sal_Bool bVisible, sal_Bool bNoActivate = sal_False );
+    virtual void                Enable( sal_Bool bEnable );
     virtual void              SetMinClientSize( long nWidth, long nHeight );
     virtual void              SetMaxClientSize( long nWidth, long nHeight );
-    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, USHORT nFlags );
+    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags );
     virtual void                GetClientSize( long& rWidth, long& rHeight );
     virtual void                GetWorkArea( Rectangle& rRect );
     virtual SalFrame*           GetParent() const;
     virtual void                SetWindowState( const SalFrameState* pState );
-    virtual BOOL                GetWindowState( SalFrameState* pState );
-    virtual void                ShowFullScreen( BOOL bFullScreen, sal_Int32 nMonitor );
-    virtual void                StartPresentation( BOOL bStart );
-    virtual void                SetAlwaysOnTop( BOOL bOnTop );
-    virtual void                ToTop( USHORT nFlags );
+    virtual sal_Bool                GetWindowState( SalFrameState* pState );
+    virtual void                ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nMonitor );
+    virtual void                StartPresentation( sal_Bool bStart );
+    virtual void                SetAlwaysOnTop( sal_Bool bOnTop );
+    virtual void                ToTop( sal_uInt16 nFlags );
     virtual void                SetPointer( PointerStyle ePointerStyle );
-    virtual void                CaptureMouse( BOOL bMouse );
+    virtual void                CaptureMouse( sal_Bool bMouse );
     virtual void                SetPointerPos( long nX, long nY );
     using SalFrame::Flush;
     virtual void                Flush();
     virtual void                Sync();
     virtual void                SetInputContext( SalInputContext* pContext );
-    virtual void                EndExtTextInput( USHORT nFlags );
-    virtual String              GetKeyName( USHORT nKeyCode );
-    virtual String              GetSymbolKeyName( const XubString& rFontName, USHORT nKeyCode );
-    virtual BOOL                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
+    virtual void                EndExtTextInput( sal_uInt16 nFlags );
+    virtual String              GetKeyName( sal_uInt16 nKeyCode );
+    virtual String              GetSymbolKeyName( const XubString& rFontName, sal_uInt16 nKeyCode );
+    virtual sal_Bool                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
     virtual LanguageType        GetInputLanguage();
     virtual SalBitmap*          SnapShot();
     virtual void                UpdateSettings( AllSettings& rSettings );
@@ -268,7 +268,7 @@ public:
     // set clip region to none (-> rectangular windows, normal state)
     virtual void                    ResetClipRegion();
     // start setting the clipregion consisting of nRects rectangles
-    virtual void                    BeginSetClipRegion( ULONG nRects );
+    virtual void                    BeginSetClipRegion( sal_uIntPtr nRects );
     // add a rectangle to the clip region
     virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
     // done setting up the clipregion
diff --git a/vcl/unx/inc/salgdi.h b/vcl/unx/inc/salgdi.h
index 8af62a5c6607..c40a85741c5d 100644
--- a/vcl/unx/inc/salgdi.h
+++ b/vcl/unx/inc/salgdi.h
@@ -101,9 +101,9 @@ protected:
 
     SalColor        nTextColor_;
     Pixel           nTextPixel_;
-    BOOL            bFontVertical_;
+    sal_Bool            bFontVertical_;
 
-    BOOL            bDisableGraphite_;
+    sal_Bool            bDisableGraphite_;
 
     GC              pBrushGC_;      // Brush attributes
     SalColor        nBrushColor_;
@@ -118,20 +118,20 @@ protected:
     GC              pStippleGC_;
     GC              pTrackingGC_;
 
-    BOOL            bWindow_ : 1;       // is Window
-    BOOL            bPrinter_ : 1;      // is Printer
-    BOOL            bVirDev_ : 1;       // is VirDev
-    BOOL            bPenGC_ : 1;        // is Pen GC valid
-    BOOL            bFontGC_ : 1;       // is Font GC valid
-    BOOL            bBrushGC_ : 1;      // is Brush GC valid
-    BOOL            bMonoGC_ : 1;       // is Mono GC valid
-    BOOL            bCopyGC_ : 1;       // is Copy GC valid
-    BOOL            bInvertGC_ : 1;     // is Invert GC valid
-    BOOL            bInvert50GC_ : 1;   // is Invert50 GC valid
-    BOOL            bStippleGC_ : 1;    // is Stipple GC valid
-    BOOL            bTrackingGC_ : 1;   // is Tracking GC valid
+    sal_Bool            bWindow_ : 1;       // is Window
+    sal_Bool            bPrinter_ : 1;      // is Printer
+    sal_Bool            bVirDev_ : 1;       // is VirDev
+    sal_Bool            bPenGC_ : 1;        // is Pen GC valid
+    sal_Bool            bFontGC_ : 1;       // is Font GC valid
+    sal_Bool            bBrushGC_ : 1;      // is Brush GC valid
+    sal_Bool            bMonoGC_ : 1;       // is Mono GC valid
+    sal_Bool            bCopyGC_ : 1;       // is Copy GC valid
+    sal_Bool            bInvertGC_ : 1;     // is Invert GC valid
+    sal_Bool            bInvert50GC_ : 1;   // is Invert50 GC valid
+    sal_Bool            bStippleGC_ : 1;    // is Stipple GC valid
+    sal_Bool            bTrackingGC_ : 1;   // is Tracking GC valid
     bool            bXORMode_ : 1;      // is ROP XOR Mode set
-    BOOL            bDitherBrush_ : 1;  // is solid or tile
+    sal_Bool            bDitherBrush_ : 1;  // is solid or tile
 
     void            SetClipRegion( GC          pGC,
                                    XLIB_Region pXReg = NULL ) const;
@@ -143,12 +143,12 @@ protected:
                               unsigned long nMask = GCGraphicsExposures );
     GC              SelectPen();
     GC              SelectBrush();
-    void            DrawLines( ULONG              nPoints,
+    void            DrawLines( sal_uIntPtr              nPoints,
                                const SalPolyLine &rPoints,
                                GC                 pGC,
                                bool bClose
                                );
-    BOOL            GetDitherPixmap ( SalColor nSalColor );
+    sal_Bool            GetDitherPixmap ( SalColor nSalColor );
 
     inline  GC              GetMonoGC( Pixmap hPixmap );
     inline  GC              GetCopyGC();
@@ -223,13 +223,13 @@ public:
 
     // overload all pure virtual methods
     virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY );
-    virtual USHORT          GetBitCount();
+    virtual sal_uInt16          GetBitCount();
     virtual long            GetGraphicsWidth() const;
     virtual long            GetGraphicsHeight() const;
 
     virtual void            ResetClipRegion();
-    virtual void            BeginSetClipRegion( ULONG nCount );
-    virtual BOOL            unionClipRegion( long nX, long nY, long nWidth, long nHeight );
+    virtual void            BeginSetClipRegion( sal_uIntPtr nCount );
+    virtual sal_Bool            unionClipRegion( long nX, long nY, long nWidth, long nHeight );
     virtual bool            unionClipRegion( const ::basegfx::B2DPolyPolygon& );
     virtual void            EndSetClipRegion();
 
@@ -245,14 +245,14 @@ public:
     virtual void            SetROPFillColor( SalROPColor nROPColor );
 
     virtual void            SetTextColor( SalColor nSalColor );
-    virtual USHORT          SetFont( ImplFontSelectData*, int nFallbackLevel );
+    virtual sal_uInt16          SetFont( ImplFontSelectData*, int nFallbackLevel );
     virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel );
-    virtual ULONG           GetKernPairs( ULONG nMaxPairs, ImplKernPairData* );
+    virtual sal_uLong           GetKernPairs( sal_uLong nMaxPairs, ImplKernPairData* );
     virtual const ImplFontCharMap* GetImplFontCharMap() const;
     virtual void            GetDevFontList( ImplDevFontList* );
     virtual void            GetDevFontSubstList( OutputDevice* );
     virtual bool            AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
-    virtual BOOL            CreateFontSubset( const rtl::OUString& rToFile,
+    virtual sal_Bool            CreateFontSubset( const rtl::OUString& rToFile,
                                               const ImplFontData*,
                                               sal_Int32* pGlyphIDs,
                                               sal_uInt8* pEncoding,
@@ -271,8 +271,8 @@ public:
                                             bool bVertical,
                                             Int32Vector& rWidths,
                                             Ucs2UIntMap& rUnicodeEnc );
-    virtual BOOL            GetGlyphBoundRect( long nIndex, Rectangle& );
-    virtual BOOL            GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
+    virtual sal_Bool            GetGlyphBoundRect( long nIndex, Rectangle& );
+    virtual sal_Bool            GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
     virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
     virtual void            DrawServerFontLayout( const ServerFontLayout& );
     virtual bool            supportsOperation( OutDevSupportType ) const;
@@ -280,9 +280,9 @@ public:
     virtual void            drawPixel( long nX, long nY, SalColor nSalColor );
     virtual void            drawLine( long nX1, long nY1, long nX2, long nY2 );
     virtual void            drawRect( long nX, long nY, long nWidth, long nHeight );
-    void                    drawPolyLine( ULONG nPoints, const SalPoint* pPtAry, bool bClose );
-    virtual void            drawPolyLine( ULONG nPoints, const SalPoint* pPtAry );
-    virtual void            drawPolygon( ULONG nPoints, const SalPoint* pPtAry );
+    void                    drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry, bool bClose );
+    virtual void            drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry );
+    virtual void            drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry );
     virtual void            drawPolyPolygon( sal_uInt32 nPoly,
                                              const sal_uInt32* pPoints,
                                              PCONSTSALPOINT* pPtAry );
@@ -291,16 +291,16 @@ public:
     virtual bool            drawFilledTrapezoids( const ::basegfx::B2DTrapezoid*, int nTrapCount, double fTransparency );
 
 #if 1 // TODO: remove these obselete methods
-    virtual sal_Bool        drawPolyLineBezier( ULONG nPoints,
+    virtual sal_Bool        drawPolyLineBezier( sal_uIntPtr nPoints,
                                                 const SalPoint* pPtAry,
-                                                const BYTE* pFlgAry );
-    virtual sal_Bool        drawPolygonBezier( ULONG nPoints,
+                                                const sal_uInt8* pFlgAry );
+    virtual sal_Bool        drawPolygonBezier( sal_uIntPtr nPoints,
                                                const SalPoint* pPtAry,
-                                               const BYTE* pFlgAry );
+                                               const sal_uInt8* pFlgAry );
     virtual sal_Bool        drawPolyPolygonBezier( sal_uInt32 nPoly,
                                                    const sal_uInt32* pPoints,
                                                    const SalPoint* const* pPtAry,
-                                                   const BYTE* const* pFlgAry );
+                                                   const sal_uInt8* const* pFlgAry );
 #endif
 
     virtual void            copyArea( long nDestX,
@@ -309,7 +309,7 @@ public:
                                       long nSrcY,
                                       long nSrcWidth,
                                       long nSrcHeight,
-                                      USHORT nFlags );
+                                      sal_uInt16 nFlags );
     virtual void            copyBits( const SalTwoRect* pPosAry,
                                       SalGraphics* pSrcGraphics );
     virtual void            drawBitmap( const SalTwoRect* pPosAry,
@@ -326,9 +326,9 @@ public:
     virtual SalBitmap*      getBitmap( long nX, long nY, long nWidth, long nHeight );
     virtual SalColor        getPixel( long nX, long nY );
     virtual void            invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags );
-    virtual void            invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+    virtual void            invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nFlags );
 
-    virtual BOOL            drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
+    virtual sal_Bool            drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize );
 
     virtual bool            drawAlphaBitmap( const SalTwoRect&,
                                              const SalBitmap& rSourceBitmap,
diff --git a/vcl/unx/inc/salinst.h b/vcl/unx/inc/salinst.h
index 133f0bf6037f..2f53a979a485 100644
--- a/vcl/unx/inc/salinst.h
+++ b/vcl/unx/inc/salinst.h
@@ -42,7 +42,7 @@
 class VCL_DLLPUBLIC SalYieldMutex : public vos::OMutex
 {
 protected:
-    ULONG                                       mnCount;
+    sal_uIntPtr                                     mnCount;
     vos::OThread::TThreadIdentifier mnThreadId;
 
 public:
@@ -52,7 +52,7 @@ public:
     virtual void                                release();
     virtual sal_Bool                            tryToAcquire();
 
-    ULONG                                       GetAcquireCount() const { return mnCount; }
+    sal_uIntPtr                                     GetAcquireCount() const { return mnCount; }
     vos::OThread::TThreadIdentifier GetThreadId() const { return mnThreadId; }
 };
 
@@ -70,16 +70,16 @@ public:
     {}
     virtual ~X11SalInstance();
 
-    virtual SalFrame*       CreateChildFrame( SystemParentData* pParent, ULONG nStyle );
-    virtual SalFrame*       CreateFrame( SalFrame* pParent, ULONG nStyle );
+    virtual SalFrame*       CreateChildFrame( SystemParentData* pParent, sal_uIntPtr nStyle );
+    virtual SalFrame*       CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle );
     virtual void                DestroyFrame( SalFrame* pFrame );
 
-    virtual SalObject*          CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE );
+    virtual SalObject*          CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True );
     virtual void                DestroyObject( SalObject* pObject );
 
     virtual SalVirtualDevice*   CreateVirtualDevice( SalGraphics* pGraphics,
                                                      long nDX, long nDY,
-                                                     USHORT nBitCount, const SystemGraphicsData *pData = NULL );
+                                                     sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL );
     virtual void                DestroyVirtualDevice( SalVirtualDevice* pDevice );
 
     virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
@@ -100,12 +100,12 @@ public:
     virtual SalSession*         CreateSalSession();
 
     virtual vos::IMutex*        GetYieldMutex();
-    virtual ULONG               ReleaseYieldMutex();
-    virtual void                AcquireYieldMutex( ULONG nCount );
+    virtual sal_uIntPtr             ReleaseYieldMutex();
+    virtual void                AcquireYieldMutex( sal_uIntPtr nCount );
     virtual bool                CheckYieldMutex();
 
     virtual void                Yield( bool bWait, bool bHandleAllCurrentEvents );
-    virtual bool                AnyInput( USHORT nType );
+    virtual bool                AnyInput( sal_uInt16 nType );
 
     virtual void*           GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
     void                    FillFontPathList( std::list< rtl::OString >& o_rFontPaths );
diff --git a/vcl/unx/inc/salobj.h b/vcl/unx/inc/salobj.h
index d7d9334f281b..c843708f0c2e 100644
--- a/vcl/unx/inc/salobj.h
+++ b/vcl/unx/inc/salobj.h
@@ -41,16 +41,16 @@ public:
                 SalClipRegion();
                ~SalClipRegion();
 
-    void        BeginSetClipRegion( ULONG nRects );
+    void        BeginSetClipRegion( sal_uIntPtr nRects );
     void        UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
 
     XRectangle *EndSetClipRegion()  {
         return ClipRectangleList;   }
     void        ResetClipRegion()   {
         numClipRectangles = 0;      }
-    USHORT      GetClipRegionType() {
+    sal_uInt16      GetClipRegionType() {
         return nClipRegionType;     }
-    void        SetClipRegionType( USHORT nType ) {
+    void        SetClipRegionType( sal_uInt16 nType ) {
         nClipRegionType = nType;    }
     int         GetRectangleCount() {
         return numClipRectangles;   }
@@ -60,7 +60,7 @@ private:
     XRectangle* ClipRectangleList;
     int         numClipRectangles;
     int         maxClipRectangles;
-    USHORT      nClipRegionType;
+    sal_uInt16      nClipRegionType;
 };
 
 
@@ -73,24 +73,24 @@ public:
     XLIB_Window     maSecondary;
     Colormap        maColormap;
     SalClipRegion   maClipRegion;
-    BOOL            mbVisible;
+    sal_Bool            mbVisible;
 
     static VCL_DLLPUBLIC long Dispatch( XEvent* pEvent );
-    static VCL_DLLPUBLIC X11SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE );
+    static VCL_DLLPUBLIC X11SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True );
 
     X11SalObject();
     virtual ~X11SalObject();
 
     // overload all pure virtual methods
      virtual void                   ResetClipRegion();
-    virtual USHORT                  GetClipRegionType();
-    virtual void                    BeginSetClipRegion( ULONG nRects );
+    virtual sal_uInt16                  GetClipRegionType();
+    virtual void                    BeginSetClipRegion( sal_uIntPtr nRects );
     virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
     virtual void                    EndSetClipRegion();
 
     virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight );
-    virtual void                    Show( BOOL bVisible );
-    virtual void                    Enable( BOOL nEnable );
+    virtual void                    Show( sal_Bool bVisible );
+    virtual void                    Enable( sal_Bool nEnable );
     virtual void                    GrabFocus();
 
     virtual void                    SetBackground();
diff --git a/vcl/unx/inc/salprn.h b/vcl/unx/inc/salprn.h
index 6e6ca0a2f1cc..7b42ad74c923 100644
--- a/vcl/unx/inc/salprn.h
+++ b/vcl/unx/inc/salprn.h
@@ -48,16 +48,16 @@ public:
     // overload all pure virtual methods
     virtual SalGraphics*            GetGraphics();
     virtual void                    ReleaseGraphics( SalGraphics* pGraphics );
-    virtual BOOL                    Setup( SalFrame* pFrame, ImplJobSetup* pSetupData );
-    virtual BOOL                    SetPrinterData( ImplJobSetup* pSetupData );
-    virtual BOOL                    SetData( ULONG nFlags, ImplJobSetup* pSetupData );
+    virtual sal_Bool                    Setup( SalFrame* pFrame, ImplJobSetup* pSetupData );
+    virtual sal_Bool                    SetPrinterData( ImplJobSetup* pSetupData );
+    virtual sal_Bool                    SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupData );
     virtual void                    GetPageInfo( const ImplJobSetup* pSetupData,
                                                  long& rOutWidth, long& rOutHeight,
                                                  long& rPageOffX, long& rPageOffY,
                                                  long& rPageWidth, long& rPageHeight );
-    virtual ULONG                   GetCapabilities( const ImplJobSetup* pSetupData, USHORT nType );
-    virtual ULONG                   GetPaperBinCount( const ImplJobSetup* pSetupData );
-    virtual String                  GetPaperBinName( const ImplJobSetup* pSetupData, ULONG nPaperBin );
+    virtual sal_uIntPtr                 GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType );
+    virtual sal_uIntPtr                 GetPaperBinCount( const ImplJobSetup* pSetupData );
+    virtual String                  GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin );
     virtual void                    InitPaperFormats( const ImplJobSetup* pSetupData );
     virtual int                 GetLandscapeAngle( const ImplJobSetup* pSetupData );
 };
@@ -76,7 +76,7 @@ public:
     psp::PrinterJob         m_aPrintJob;
     psp::JobData            m_aJobData;
     psp::PrinterGfx         m_aPrinterGfx;
-    ULONG                   m_nCopies;
+    sal_uIntPtr                 m_nCopies;
     bool                    m_bCollate;
     SalInfoPrinter*         m_pInfoPrinter;
 
@@ -85,23 +85,23 @@ public:
 
     // overload all pure virtual methods
     using SalPrinter::StartJob;
-    virtual BOOL                    StartJob( const XubString* pFileName,
+    virtual sal_Bool                    StartJob( const XubString* pFileName,
                                               const XubString& rJobName,
                                               const XubString& rAppName,
-                                              ULONG nCopies,
+                                              sal_uIntPtr nCopies,
                                               bool bCollate,
                                               bool bDirect,
                                               ImplJobSetup* pSetupData );
-    virtual BOOL                    StartJob( const String*,
+    virtual sal_Bool                    StartJob( const String*,
                                               const String&,
                                               const String&,
                                               ImplJobSetup*,
                                               vcl::PrinterController& i_rController );
-    virtual BOOL                    EndJob();
-    virtual BOOL                    AbortJob();
-    virtual SalGraphics*            StartPage( ImplJobSetup* pSetupData, BOOL bNewJobData );
-    virtual BOOL                    EndPage();
-    virtual ULONG                   GetErrorCode();
+    virtual sal_Bool                    EndJob();
+    virtual sal_Bool                    AbortJob();
+    virtual SalGraphics*            StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJobData );
+    virtual sal_Bool                    EndPage();
+    virtual sal_uIntPtr                 GetErrorCode();
 };
 
 class Timer;
diff --git a/vcl/unx/inc/saltimer.h b/vcl/unx/inc/saltimer.h
index 132107d705f8..ba52b96c073a 100644
--- a/vcl/unx/inc/saltimer.h
+++ b/vcl/unx/inc/saltimer.h
@@ -37,7 +37,7 @@ public:
     virtual ~X11SalTimer();
 
     // overload all pure virtual methods
-    void            Start( ULONG nMS );
+    void            Start( sal_uIntPtr nMS );
     void            Stop();
 };
 
diff --git a/vcl/unx/inc/salunx.h b/vcl/unx/inc/salunx.h
index ef53273b60b4..8be91cbd3bce 100644
--- a/vcl/unx/inc/salunx.h
+++ b/vcl/unx/inc/salunx.h
@@ -68,7 +68,7 @@ inline int operator == ( const timeval &t1, const timeval &t2 )
 {
     if( t1.tv_sec == t2.tv_sec )
         return t1.tv_usec == t2.tv_usec;
-    return FALSE;
+    return sal_False;
 }
 
 inline timeval &operator -= ( timeval &t1, const timeval &t2 )
@@ -95,7 +95,7 @@ inline timeval &operator += ( timeval &t1, const timeval &t2 )
     return t1;
 }
 
-inline timeval &operator += ( timeval &t1, ULONG t2 )
+inline timeval &operator += ( timeval &t1, sal_uIntPtr t2 )
 {
     t1.tv_sec  += t2 / 1000;
     t1.tv_usec += t2 ? (t2 % 1000) * 1000 : 500;
@@ -113,7 +113,7 @@ inline timeval operator + ( const timeval &t1, const timeval &t2 )
     return t0 += t2;
 }
 
-inline timeval operator + ( const timeval &t1, ULONG t2 )
+inline timeval operator + ( const timeval &t1, sal_uIntPtr t2 )
 {
     timeval t0 = t1;
     return t0 += t2;
diff --git a/vcl/unx/inc/salvd.h b/vcl/unx/inc/salvd.h
index 3d8c681c4e22..c6bf12165ae9 100644
--- a/vcl/unx/inc/salvd.h
+++ b/vcl/unx/inc/salvd.h
@@ -48,17 +48,17 @@ class X11SalVirtualDevice : public SalVirtualDevice
 
     int             nDX_;
     int             nDY_;
-    USHORT          nDepth_;
-    BOOL            bGraphics_;         // is Graphics used
-    BOOL            bExternPixmap_;
+    sal_uInt16          nDepth_;
+    sal_Bool            bGraphics_;         // is Graphics used
+    sal_Bool            bExternPixmap_;
 
 public:
     X11SalVirtualDevice();
     virtual ~X11SalVirtualDevice();
 
-    BOOL            Init( SalDisplay *pDisplay,
+    sal_Bool            Init( SalDisplay *pDisplay,
                           long nDX, long nDY,
-                          USHORT nBitCount,
+                          sal_uInt16 nBitCount,
                           int nScreen,
                           Pixmap hDrawable = None,
                           void* pRenderFormat = NULL );
@@ -66,9 +66,9 @@ public:
 
     inline  Display        *GetXDisplay() const;
     inline  SalDisplay     *GetDisplay() const;
-    inline  BOOL            IsDisplay() const;
+    inline  sal_Bool            IsDisplay() const;
     inline  Pixmap          GetDrawable() const { return hDrawable_; }
-    inline  USHORT          GetDepth() const { return nDepth_; }
+    inline  sal_uInt16          GetDepth() const { return nDepth_; }
     int                     GetWidth() const { return nDX_; }
     int                     GetHeight() const { return nDY_; }
     int                     GetScreenNumber() const { return m_nScreen; }
@@ -77,7 +77,7 @@ public:
     virtual void            ReleaseGraphics( SalGraphics* pGraphics );
 
                             // Set new size, without saving the old contents
-    virtual BOOL            SetSize( long nNewDX, long nNewDY );
+    virtual sal_Bool            SetSize( long nNewDX, long nNewDY );
     virtual void            GetSize( long& rWidth, long& rHeight );
 };
 
@@ -92,7 +92,7 @@ inline Display *X11SalVirtualDevice::GetXDisplay() const
 inline SalDisplay *X11SalVirtualDevice::GetDisplay() const
 { return pDisplay_; }
 
-inline BOOL X11SalVirtualDevice::IsDisplay() const
+inline sal_Bool X11SalVirtualDevice::IsDisplay() const
 { return pDisplay_->IsDisplay(); }
 
 #endif
diff --git a/vcl/unx/inc/soicon.hxx b/vcl/unx/inc/soicon.hxx
index 419f9b2cc54a..4efaea4e736f 100644
--- a/vcl/unx/inc/soicon.hxx
+++ b/vcl/unx/inc/soicon.hxx
@@ -31,7 +31,7 @@ class SalDisplay;
 class SalBitmap;
 class Bitmap;
 
-BOOL SelectAppIconPixmap( SalDisplay *pDisplay, int nScreen,
-                          USHORT nIcon, USHORT iconSize,
+sal_Bool SelectAppIconPixmap( SalDisplay *pDisplay, int nScreen,
+                          sal_uInt16 nIcon, sal_uInt16 iconSize,
                           Pixmap& icon_pixmap, Pixmap& icon_mask );
 #endif
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index 34b0ff652cde..ae3938b4fbb9 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -137,7 +137,7 @@ void KDEXLib::Init()
             "http://artax.karlin.mff.cuni.cz/~kendy" );
 
     m_nFakeCmdLineArgs = 1;
-    USHORT nIdx;
+    sal_uInt16 nIdx;
     vos::OExtCommandLine aCommandLine;
     int nParams = aCommandLine.getCommandArgCount();
     rtl::OString aDisplay;
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 29d79f88ffb3..30cbb0cea365 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -242,7 +242,7 @@ class WidgetPainter
         @param gc
         The graphics context.
     */
-        BOOL drawStyledWidget( QWidget *pWidget,
+        sal_Bool drawStyledWidget( QWidget *pWidget,
                 ControlState nState, const ImplControlValue& aValue,
                 Display *dpy, XLIB_Window drawable, int nScreen, int nDepth, GC gc,
                 ControlPart nPart = PART_ENTIRE_CONTROL );
@@ -255,7 +255,7 @@ class WidgetPainter
 
         @return valid push button.
     */
-    QPushButton  *pushButton( const Rectangle& rControlRegion, BOOL bDefault );
+    QPushButton  *pushButton( const Rectangle& rControlRegion, sal_Bool bDefault );
 
     /** 'Get' method for radio button.
 
@@ -276,7 +276,7 @@ class WidgetPainter
 
         @see pushButton(), m_pEditableComboBox
     */
-    QComboBox    *comboBox( const Rectangle& rControlRegion, BOOL bEditable );
+    QComboBox    *comboBox( const Rectangle& rControlRegion, sal_Bool bEditable );
 
     /** 'Get' method for line edit box.
 
@@ -313,13 +313,13 @@ class WidgetPainter
         @see pushButton()
     */
     QScrollBar   *scrollBar( const Rectangle& rControlRegion,
-        BOOL bHorizontal, const ImplControlValue& aValue );
+        sal_Bool bHorizontal, const ImplControlValue& aValue );
 
     /** 'Get' method for tool bar.
 
       @see pushButton()
     */
-    QToolBar     *toolBar( const Rectangle& rControlRegion, BOOL bHorizontal );
+    QToolBar     *toolBar( const Rectangle& rControlRegion, sal_Bool bHorizontal );
 
     /** 'Get' method for tool button.
 
@@ -430,13 +430,13 @@ WidgetPainter::~WidgetPainter( void )
     delete m_pProgressBar, m_pProgressBar = NULL;
 }
 
-BOOL WidgetPainter::drawStyledWidget( QWidget *pWidget,
+sal_Bool WidgetPainter::drawStyledWidget( QWidget *pWidget,
     ControlState nState, const ImplControlValue& aValue,
         Display *dpy, XLIB_Window drawable, int nScreen, int nDepth, GC gc,
         ControlPart nPart )
 {
     if ( !pWidget )
-    return FALSE;
+    return sal_False;
 
     // Normalize the widget
     QPoint   qWidgetPos( pWidget->pos() );
@@ -591,7 +591,7 @@ BOOL WidgetPainter::drawStyledWidget( QWidget *pWidget,
         pTab = m_pTabMiddle;
     }
     if ( !pTab )
-        return FALSE;
+        return sal_False;
 
     pTab->setRect( qRect );
 
@@ -779,7 +779,7 @@ BOOL WidgetPainter::drawStyledWidget( QWidget *pWidget,
             pWidget->colorGroup(), nStyle );
     }
     else
-    return FALSE;
+    return sal_False;
 
     // Bitblt it to the screen
     X11SalGraphics::CopyScreenArea( dpy,
@@ -792,11 +792,11 @@ BOOL WidgetPainter::drawStyledWidget( QWidget *pWidget,
     // Restore widget's position
     pWidget->move( qWidgetPos );
 
-    return TRUE;
+    return sal_True;
 }
 
 QPushButton *WidgetPainter::pushButton( const Rectangle& rControlRegion,
-    BOOL bDefault )
+    sal_Bool bDefault )
 {
     if ( !m_pPushButton )
     m_pPushButton = new QPushButton( NULL, "push_button" );
@@ -891,7 +891,7 @@ QCheckBox *WidgetPainter::checkBox( const Rectangle& rControlRegion )
 }
 
 QComboBox *WidgetPainter::comboBox( const Rectangle& rControlRegion,
-    BOOL bEditable )
+    sal_Bool bEditable )
 {
     QComboBox *pComboBox = NULL;
     if ( bEditable )
@@ -1004,7 +1004,7 @@ QListView *WidgetPainter::listView( const Rectangle& rControlRegion )
 }
 
 QScrollBar *WidgetPainter::scrollBar( const Rectangle& rControlRegion,
-    BOOL bHorizontal, const ImplControlValue& aValue )
+    sal_Bool bHorizontal, const ImplControlValue& aValue )
 {
     if ( !m_pScrollBar )
     {
@@ -1031,7 +1031,7 @@ QScrollBar *WidgetPainter::scrollBar( const Rectangle& rControlRegion,
     return m_pScrollBar;
 }
 
-QToolBar *WidgetPainter::toolBar( const Rectangle& rControlRegion, BOOL bHorizontal )
+QToolBar *WidgetPainter::toolBar( const Rectangle& rControlRegion, sal_Bool bHorizontal )
 {
     if ( !m_pMainWindow )
         m_pMainWindow = new QMainWindow( NULL, "main_window" );
@@ -1172,19 +1172,19 @@ class KDESalGraphics : public X11SalGraphics
   public:
     KDESalGraphics() {}
     virtual ~KDESalGraphics() {}
-    virtual BOOL IsNativeControlSupported( ControlType nType, ControlPart nPart );
-    virtual BOOL hitTestNativeControl( ControlType nType, ControlPart nPart,
+    virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart );
+    virtual sal_Bool hitTestNativeControl( ControlType nType, ControlPart nPart,
                                        const Rectangle& rControlRegion, const Point& aPos,
-                                       BOOL& rIsInside );
-    virtual BOOL drawNativeControl( ControlType nType, ControlPart nPart,
+                                       sal_Bool& rIsInside );
+    virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart,
                                     const Rectangle& rControlRegion, ControlState nState,
                                     const ImplControlValue& aValue,
                                     const OUString& aCaption );
-    virtual BOOL drawNativeControlText( ControlType nType, ControlPart nPart,
+    virtual sal_Bool drawNativeControlText( ControlType nType, ControlPart nPart,
                                         const Rectangle& rControlRegion, ControlState nState,
                                         const ImplControlValue& aValue,
                                         const OUString& aCaption );
-    virtual BOOL getNativeControlRegion( ControlType nType, ControlPart nPart,
+    virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart,
                                          const Rectangle& rControlRegion, ControlState nState,
                                          const ImplControlValue& aValue,
                                          const OUString& aCaption,
@@ -1199,10 +1199,10 @@ class KDESalGraphics : public X11SalGraphics
     @param nPart
     Specification of the widget's part if it consists of more than one.
 
-    @return TRUE if the platform supports native drawing of the widget nType
+    @return sal_True if the platform supports native drawing of the widget nType
     defined by nPart.
 */
-BOOL KDESalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart )
+sal_Bool KDESalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart )
 {
     return
     ( (nType == CTRL_PUSHBUTTON)  && (nPart == PART_ENTIRE_CONTROL) ) ||
@@ -1234,21 +1234,21 @@ BOOL KDESalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP
 
 /** Test whether the position is in the native widget.
 
-    If the return value is TRUE, bIsInside contains information whether
+    If the return value is sal_True, bIsInside contains information whether
     aPos was or was not inside the native widget specified by the
     nType/nPart combination.
 */
-BOOL KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart,
+sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart,
                                            const Rectangle& rControlRegion, const Point& rPos,
-                                           BOOL& rIsInside )
+                                           sal_Bool& rIsInside )
 {
     if ( nType == CTRL_SCROLLBAR )
     {
     // make position relative to rControlRegion
     Point aPos = rPos - rControlRegion.TopLeft();
-    rIsInside = FALSE;
+    rIsInside = sal_False;
 
-    BOOL bHorizontal = ( nPart == PART_BUTTON_LEFT || nPart == PART_BUTTON_RIGHT );
+    sal_Bool bHorizontal = ( nPart == PART_BUTTON_LEFT || nPart == PART_BUTTON_RIGHT );
 
     QScrollBar *pScrollBar = pWidgetPainter->scrollBar( rControlRegion,
         bHorizontal, ImplControlValue() );
@@ -1258,10 +1258,10 @@ BOOL KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart,
         QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarAddLine );
 
     // There are 2 buttons on the right/bottom side of the scrollbar
-    BOOL bTwoSubButtons = FALSE;
+    sal_Bool bTwoSubButtons = sal_False;
 
     // It is a Platinum style scroll bar
-    BOOL bPlatinumStyle = FALSE;
+    sal_Bool bPlatinumStyle = sal_False;
 
     // Workaround for Platinum and 3 button style scroll bars.
     // It makes the right/down button bigger.
@@ -1271,9 +1271,9 @@ BOOL KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart,
             QStyle::CC_ScrollBar, pScrollBar,
             QStyle::SC_ScrollBarAddPage ).right() + 1 );
         if ( qRectAddLine.width() > qRectSubLine.width() )
-        bTwoSubButtons = TRUE;
+        bTwoSubButtons = sal_True;
         if ( qRectSubLine.left() > kapp->style().querySubControlMetrics( QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarSubPage ).left() )
-        bPlatinumStyle = TRUE;
+        bPlatinumStyle = sal_True;
     }
     else
     {
@@ -1281,16 +1281,16 @@ BOOL KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart,
             QStyle::CC_ScrollBar, pScrollBar,
             QStyle::SC_ScrollBarAddPage ).bottom() + 1 );
         if ( qRectAddLine.height() > qRectSubLine.height() )
-        bTwoSubButtons = TRUE;
+        bTwoSubButtons = sal_True;
         if ( qRectSubLine.top() > kapp->style().querySubControlMetrics( QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarSubPage ).top() )
-        bPlatinumStyle = TRUE;
+        bPlatinumStyle = sal_True;
     }
 
     switch ( nPart )
     {
         case PART_BUTTON_LEFT:
         if ( !bPlatinumStyle && qRectSubLine.contains( aPos.getX(), aPos.getY() ) )
-            rIsInside = TRUE;
+            rIsInside = sal_True;
         else if ( bTwoSubButtons )
         {
             qRectAddLine.setWidth( qRectAddLine.width() / 2 );
@@ -1300,7 +1300,7 @@ BOOL KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart,
 
         case PART_BUTTON_UP:
         if ( !bPlatinumStyle && qRectSubLine.contains( aPos.getX(), aPos.getY() ) )
-            rIsInside = TRUE;
+            rIsInside = sal_True;
         else if ( bTwoSubButtons )
         {
             qRectAddLine.setHeight( qRectAddLine.height() / 2 );
@@ -1324,13 +1324,13 @@ BOOL KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart,
 
         // cases PART_TRACK_HORZ_AREA and PART_TRACK_VERT_AREA
         default:
-        return FALSE;
+        return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 
@@ -1345,12 +1345,12 @@ BOOL KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart,
     @param aCaption
     A caption or title string (like button text etc.)
 */
-BOOL KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart,
+sal_Bool KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart,
                                         const Rectangle& rControlRegion, ControlState nState,
                                         const ImplControlValue& aValue,
                                         const OUString& )
 {
-    BOOL bReturn = FALSE;
+    sal_Bool bReturn = sal_False;
 
     Display *dpy = GetXDisplay();
     XLIB_Window drawable = GetDrawable();
@@ -1380,7 +1380,7 @@ BOOL KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart,
     else if ( (nType == CTRL_COMBOBOX) && (nPart == PART_ENTIRE_CONTROL) )
     {
     bReturn = pWidgetPainter->drawStyledWidget(
-        pWidgetPainter->comboBox( rControlRegion, TRUE ),
+        pWidgetPainter->comboBox( rControlRegion, sal_True ),
         nState, aValue,
         dpy, drawable, GetScreenNumber(), GetVisual().GetDepth(), gc );
     }
@@ -1394,7 +1394,7 @@ BOOL KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart,
     else if ( (nType == CTRL_LISTBOX) && (nPart == PART_ENTIRE_CONTROL) )
     {
     bReturn = pWidgetPainter->drawStyledWidget(
-        pWidgetPainter->comboBox( rControlRegion, FALSE ),
+        pWidgetPainter->comboBox( rControlRegion, sal_False ),
         nState, aValue,
         dpy, drawable, GetScreenNumber(), GetVisual().GetDepth(), gc );
     }
@@ -1487,17 +1487,17 @@ BOOL KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart,
     @param aCaption
     A caption or title string (like button text etc.)
 */
-BOOL KDESalGraphics::drawNativeControlText( ControlType, ControlPart,
+sal_Bool KDESalGraphics::drawNativeControlText( ControlType, ControlPart,
                                             const Rectangle&, ControlState,
                                             const ImplControlValue&,
                                             const OUString& )
 {
-    return FALSE;
+    return sal_False;
 }
 
 /** Check if the bounding regions match.
 
-    If the return value is TRUE, rNativeBoundingRegion
+    If the return value is sal_True, rNativeBoundingRegion
     contains the true bounding region covered by the control
     including any adornment, while rNativeContentRegion contains the area
     within the control that can be safely drawn into without drawing over
@@ -1512,13 +1512,13 @@ BOOL KDESalGraphics::drawNativeControlText( ControlType, ControlPart,
     @param aCaption
     A caption or title string (like button text etc.)
 */
-BOOL KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart,
+sal_Bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart,
                                              const Rectangle& rControlRegion, ControlState nState,
                                              const ImplControlValue&,
                                              const OUString&,
                                              Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion )
 {
-    BOOL bReturn = FALSE;
+    sal_Bool bReturn = sal_False;
     QRect qBoundingRect = WidgetPainter::region2QRect( rControlRegion );
     QRect qRect;
 
@@ -1540,7 +1540,7 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
                 QStyle::PM_ButtonDefaultIndicator, pWidget );
             qBoundingRect.addCoords( -nIndicatorSize, -nIndicatorSize,
                 nIndicatorSize, nIndicatorSize );
-            bReturn = TRUE;
+            bReturn = sal_True;
             }
             break;
         }
@@ -1555,7 +1555,7 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
                 qRect.setWidth( kapp->style().pixelMetric( QStyle::PM_ExclusiveIndicatorWidth, pWidget ) );
                 qRect.setHeight( kapp->style().pixelMetric( QStyle::PM_ExclusiveIndicatorHeight, pWidget ) );
 
-                bReturn = TRUE;
+                bReturn = sal_True;
             }
             break;
 
@@ -1568,7 +1568,7 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
                 qRect.setWidth( kapp->style().pixelMetric( QStyle::PM_IndicatorWidth, pWidget ) );
                 qRect.setHeight( kapp->style().pixelMetric( QStyle::PM_IndicatorHeight, pWidget ) );
 
-                bReturn = TRUE;
+                bReturn = sal_True;
             }
             break;
 
@@ -1585,14 +1585,14 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
                 QStyle::CC_ComboBox, pWidget,
                 QStyle::SC_ComboBoxEditField ).right() + 1 );
             qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() );
-            bReturn = TRUE;
+            bReturn = sal_True;
             break;
 
         case PART_SUB_EDIT:
             qRect = kapp->style().querySubControlMetrics(
                 QStyle::CC_ComboBox, pWidget, QStyle::SC_ComboBoxEditField );
             qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() );
-            bReturn = TRUE;
+            bReturn = sal_True;
             break;
         }
         break;
@@ -1605,14 +1605,14 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
         case PART_BUTTON_UP:
             qRect = kapp->style().querySubControlMetrics(
                 QStyle::CC_SpinWidget, pWidget, QStyle::SC_SpinWidgetUp );
-            bReturn = TRUE;
+            bReturn = sal_True;
             qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() );
             break;
 
         case PART_BUTTON_DOWN:
             qRect = kapp->style().querySubControlMetrics(
                 QStyle::CC_SpinWidget, pWidget, QStyle::SC_SpinWidgetDown );
-            bReturn = TRUE;
+            bReturn = sal_True;
             qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() );
             break;
 
@@ -1620,7 +1620,7 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
             qRect = kapp->style().querySubControlMetrics(
                 QStyle::CC_SpinWidget, pWidget, QStyle::SC_SpinWidgetEditField );
             qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() );
-            bReturn = TRUE;
+            bReturn = sal_True;
             break;
         }
         break;
@@ -1662,7 +1662,7 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
 
             qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() );
 
-            bReturn = TRUE;
+            bReturn = sal_True;
             break;
 
         case PART_BUTTON_RIGHT:
@@ -1683,7 +1683,7 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
 
             qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() );
 
-            bReturn = TRUE;
+            bReturn = sal_True;
             break;
         }
             break;
@@ -1710,12 +1710,12 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
 // KDESalFrame implementation
 // -----------------------------------------------------------------------
 
-KDESalFrame::KDESalFrame( SalFrame* pParent, ULONG nStyle ) :
+KDESalFrame::KDESalFrame( SalFrame* pParent, sal_uLong nStyle ) :
     X11SalFrame( pParent, nStyle )
 {
 }
 
-void KDESalFrame::Show( BOOL bVisible, BOOL bNoActivate )
+void KDESalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate )
 {
     if ( !GetParent() && ! (GetStyle() & SAL_FRAME_STYLE_INTRO) )
     {
@@ -1928,9 +1928,9 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
     {
         Color aColor2 = aStyleSettings.GetLightColor();
         aStyleSettings.
-            SetCheckedColor( Color( (BYTE)(((USHORT)aBack.GetRed()+(USHORT)aColor2.GetRed())/2),
-                        (BYTE)(((USHORT)aBack.GetGreen()+(USHORT)aColor2.GetGreen())/2),
-                        (BYTE)(((USHORT)aBack.GetBlue()+(USHORT)aColor2.GetBlue())/2)
+            SetCheckedColor( Color( (sal_uInt8)(((sal_uInt16)aBack.GetRed()+(sal_uInt16)aColor2.GetRed())/2),
+                        (sal_uInt8)(((sal_uInt16)aBack.GetGreen()+(sal_uInt16)aColor2.GetGreen())/2),
+                        (sal_uInt8)(((sal_uInt16)aBack.GetBlue()+(sal_uInt16)aColor2.GetBlue())/2)
                         ) );
     }
 
@@ -1962,7 +1962,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
     qMainWindow.createGUI( "/dev/null" ); // hack
 
     // Menu
-    aStyleSettings.SetSkipDisabledInMenus( TRUE );
+    aStyleSettings.SetSkipDisabledInMenus( sal_True );
     KMenuBar *pMenuBar = qMainWindow.menuBar();
     if ( pMenuBar )
     {
@@ -2083,7 +2083,7 @@ KDESalFrame::GraphicsHolder::~GraphicsHolder()
 // -----------------------------------------------------------------------
 
 SalFrame *
-KDESalInstance::CreateFrame( SalFrame *pParent, ULONG nStyle )
+KDESalInstance::CreateFrame( SalFrame *pParent, sal_uLong nStyle )
 {
     return new KDESalFrame( pParent, nStyle );
 }
diff --git a/vcl/unx/source/app/i18n_cb.cxx b/vcl/unx/source/app/i18n_cb.cxx
index d3a4f2b819ae..9756c728250d 100644
--- a/vcl/unx/source/app/i18n_cb.cxx
+++ b/vcl/unx/source/app/i18n_cb.cxx
@@ -284,12 +284,12 @@ Preedit_UpdateAttributes ( preedit_text_t* ptext, XIMFeedback* feedback,
 // Convert the XIM feedback values into appropriate VCL
 // SAL_EXTTEXTINPUT_ATTR values
 // returns an allocate list of attributes, which must be freed by caller
-USHORT*
-Preedit_FeedbackToSAL ( XIMFeedback* pfeedback, int nlength, std::vector<USHORT>& rSalAttr )
+sal_uInt16*
+Preedit_FeedbackToSAL ( XIMFeedback* pfeedback, int nlength, std::vector<sal_uInt16>& rSalAttr )
 {
-      USHORT *psalattr;
-      USHORT  nval;
-      USHORT  noldval = 0;
+      sal_uInt16 *psalattr;
+      sal_uInt16  nval;
+      sal_uInt16  noldval = 0;
       XIMFeedback nfeedback;
 
       // only work with reasonable length
@@ -299,7 +299,7 @@ Preedit_FeedbackToSAL ( XIMFeedback* pfeedback, int nlength, std::vector<USHORT>
         psalattr = &rSalAttr[0];
     }
       else
-        return (USHORT*)NULL;
+        return (sal_uInt16*)NULL;
 
       for (int npos = 0; npos < nlength; npos++)
     {
diff --git a/vcl/unx/source/app/i18n_ic.cxx b/vcl/unx/source/app/i18n_ic.cxx
index 3064be9367e1..46471d553dda 100644
--- a/vcl/unx/source/app/i18n_ic.cxx
+++ b/vcl/unx/source/app/i18n_ic.cxx
@@ -187,7 +187,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) :
     maClientData.aInputEv.mnCursorPos       = 0;
     maClientData.aInputEv.mnDeltaStart      = 0;
     maClientData.aInputEv.mnCursorFlags     = 0;
-    maClientData.aInputEv.mbOnlyCursor      = FALSE;
+    maClientData.aInputEv.mbOnlyCursor      = sal_False;
 
     SalI18N_InputMethod *pInputMethod;
     pInputMethod = GetX11SalData()->GetDisplay()->GetInputMethod();
@@ -763,7 +763,7 @@ SalI18N_InputContext::SetLanguage(LanguageType)
 }
 
 void
-SalI18N_InputContext::EndExtTextInput( USHORT /*nFlags*/ )
+SalI18N_InputContext::EndExtTextInput( sal_uInt16 /*nFlags*/ )
 {
     if ( mbUseable && (maContext != NULL) && maClientData.pFrame )
     {
diff --git a/vcl/unx/source/app/i18n_status.cxx b/vcl/unx/source/app/i18n_status.cxx
index 3a6ae26a2b0e..844775779935 100644
--- a/vcl/unx/source/app/i18n_status.cxx
+++ b/vcl/unx/source/app/i18n_status.cxx
@@ -102,7 +102,7 @@ class XIMStatusWindow : public StatusWindow
     // for delayed showing
     bool                    m_bDelayedShow;
     I18NStatus::ShowReason  m_eDelayedReason;
-    ULONG                   m_nDelayedEvent;
+    sal_uLong                   m_nDelayedEvent;
     // for toggling
     bool                    m_bOn;
 
@@ -165,7 +165,7 @@ void XIMStatusWindow::layout()
 
     m_aStatusText.SetPosSizePixel( Point( 1, 1 ), aControlSize );
     m_aStatusText.SetFont( aFont );
-    m_aStatusText.Show( TRUE );
+    m_aStatusText.Show( sal_True );
 
     if (m_bAnchoredAtRight && IsVisible())
     {
@@ -257,7 +257,7 @@ void XIMStatusWindow::setPosition( SalFrame* pParent )
         {
             setText( String() );
             m_pLastParent = pParent;
-            Show( FALSE, SHOW_NOACTIVATE );
+            Show( sal_False, SHOW_NOACTIVATE );
         }
         if( IsVisible() )
         {
@@ -359,7 +359,7 @@ IIIMPStatusWindow::IIIMPStatusWindow( SalFrame* pParent, bool bOn ) :
 
     m_aStatusBtn.SetSelectHdl( LINK( this, IIIMPStatusWindow, SelectHdl ) );
     m_aStatusBtn.SetPopupMenu( &m_aMenu );
-    m_aStatusBtn.Show( TRUE );
+    m_aStatusBtn.Show( sal_True );
 
     const ::std::vector< I18NStatus::ChoiceData >& rChoices( I18NStatus::get().getChoices() );
     int i = 1;
@@ -384,7 +384,7 @@ IIIMPStatusWindow::IIIMPStatusWindow( SalFrame* pParent, bool bOn ) :
     else
         fprintf( stderr, "Warning: could not reposition status window since no frame\n" );
 #endif
-    EnableAlwaysOnTop( TRUE );
+    EnableAlwaysOnTop( sal_True );
 }
 
 IIIMPStatusWindow::~IIIMPStatusWindow()
diff --git a/vcl/unx/source/app/keysymnames.cxx b/vcl/unx/source/app/keysymnames.cxx
index c9515f016433..b48f0e629bd9 100644
--- a/vcl/unx/source/app/keysymnames.cxx
+++ b/vcl/unx/source/app/keysymnames.cxx
@@ -597,7 +597,7 @@ static const keyboard_layout type6_layout[] =
 #include <stdio.h>
 #endif
 
-const char* SalDisplay::GetKeyboardName( BOOL bRefresh )
+const char* SalDisplay::GetKeyboardName( sal_Bool bRefresh )
 {
     if( bRefresh || ! m_aKeyboardName.Len() )
     {
diff --git a/vcl/unx/source/app/saldata.cxx b/vcl/unx/source/app/saldata.cxx
index beb7b60a551c..b14c11ac783e 100644
--- a/vcl/unx/source/app/saldata.cxx
+++ b/vcl/unx/source/app/saldata.cxx
@@ -408,7 +408,7 @@ void SalXLib::Init()
     sal_uInt32 nParams = aCommandLine.getCommandArgCount();
     rtl::OUString aParam;
     rtl::OString aDisplay;
-    for (USHORT i=0; i<nParams; i++)
+    for (sal_uInt16 i=0; i<nParams; i++)
     {
         aCommandLine.getCommandArg(i, aParam);
         if (aParam.equalsAscii("-display"))
diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx
index 92d5f75f7315..91f6934f27f0 100644
--- a/vcl/unx/source/app/saldisp.cxx
+++ b/vcl/unx/source/app/saldisp.cxx
@@ -213,7 +213,7 @@ static int sal_significantBits( Pixel nMask )
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-static BOOL sal_GetVisualInfo( Display *pDisplay, XID nVID, XVisualInfo &rVI )
+static sal_Bool sal_GetVisualInfo( Display *pDisplay, XID nVID, XVisualInfo &rVI )
 {
     int         nInfos;
     XVisualInfo aTemplate;
@@ -223,25 +223,25 @@ static BOOL sal_GetVisualInfo( Display *pDisplay, XID nVID, XVisualInfo &rVI )
 
     pInfos = XGetVisualInfo( pDisplay, VisualIDMask, &aTemplate, &nInfos );
     if( !pInfos )
-        return FALSE;
+        return sal_False;
 
     rVI = *pInfos;
     XFree( pInfos );
 
     DBG_ASSERT( rVI.visualid == nVID,
                 "sal_GetVisualInfo: could not get correct visual by visualId" );
-    return TRUE;
+    return sal_True;
 }
 
 // ---------------------------------------------------------------------------
 
 // check wether displaystring is in format N.M or N. or just N
 // with N and M beeing natural numbers
-static BOOL
+static sal_Bool
 sal_IsDisplayNumber( const char *pDisplayString )
 {
     if ( ! isdigit(*pDisplayString) )
-        return FALSE;
+        return sal_False;
     while ( isdigit(*(++pDisplayString)) )
         ; /* do nothing */
 
@@ -255,12 +255,12 @@ sal_IsDisplayNumber( const char *pDisplayString )
 }
 
 // check whether host1 and host2 point to the same ip address
-static BOOL
+static sal_Bool
 sal_EqualHosts( const OUString& Host1, const OUString& Host2)
 {
     oslSocketAddr pHostAddr1;
     oslSocketAddr pHostAddr2;
-    BOOL bEqualAddress = FALSE;
+    sal_Bool bEqualAddress = sal_False;
 
     if ( Host1.toChar() >= '0' && Host1.toChar() <= '9' )
         pHostAddr1 = osl_createInetSocketAddr( Host1.pData, 0 );
@@ -273,7 +273,7 @@ sal_EqualHosts( const OUString& Host1, const OUString& Host2)
         pHostAddr2 = osl_resolveHostname( Host2.pData );
 
     if( pHostAddr1 && pHostAddr2 )
-        bEqualAddress = osl_isEqualSocketAddr( pHostAddr1, pHostAddr2 ) ? TRUE : FALSE;
+        bEqualAddress = osl_isEqualSocketAddr( pHostAddr1, pHostAddr2 ) ? sal_True : sal_False;
 
     if( pHostAddr1 )
         osl_destroySocketAddr( pHostAddr1 );
@@ -283,14 +283,14 @@ sal_EqualHosts( const OUString& Host1, const OUString& Host2)
     return bEqualAddress;
 }
 
-static BOOL
+static sal_Bool
 sal_IsLocalDisplay( Display *pDisplay )
 {
     const char *pDisplayString = DisplayString( pDisplay );
 
     // no string, no idea
     if (   pDisplayString == NULL || pDisplayString[ 0 ] == '\0')
-        return FALSE;
+        return sal_False;
 
     // check for ":x.y"
     if ( pDisplayString[ 0 ] == ':' )
@@ -314,7 +314,7 @@ sal_IsLocalDisplay( Display *pDisplay )
 
     // compare local hostname to displaystring, both may be ip address or
     // hostname
-    BOOL  bEqual = FALSE;
+    sal_Bool  bEqual = sal_False;
     char *pDisplayHost  = strdup(  pDisplayString );
     char *pPtr          = strrchr( pDisplayHost, ':' );
 
@@ -339,14 +339,14 @@ sal_IsLocalDisplay( Display *pDisplay )
 // since it is not called very often and sal_IsLocalDisplay() is relative
 // expensive bLocal_ is initialized on first call
 
-BOOL SalDisplay::IsLocal()
+sal_Bool SalDisplay::IsLocal()
 {
     if ( ! mbLocalIsValid )
     {
         bLocal_ = sal_IsLocalDisplay( pDisp_ );
-        mbLocalIsValid = TRUE;
+        mbLocalIsValid = sal_True;
     }
-    return (BOOL)bLocal_;
+    return (sal_Bool)bLocal_;
 }
 
 // ---------------------------------------------------------------------------
@@ -406,7 +406,7 @@ static sal_Bool sal_IsTrustedSolaris (Display *p_display)
 
 // -=-= SalDisplay -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-BOOL SalDisplay::BestVisual( Display     *pDisplay,
+sal_Bool SalDisplay::BestVisual( Display     *pDisplay,
                              int          nScreen,
                              XVisualInfo &rVI )
 {
@@ -431,51 +431,51 @@ BOOL SalDisplay::BestVisual( Display     *pDisplay,
     int i;
     for( i = 0; i < nVisuals; i++ )
     {
-        BOOL bUsable = FALSE;
+        sal_Bool bUsable = sal_False;
         int nTrueColor = 1;
 
         if ( pVInfos[i].screen != nScreen )
         {
-            bUsable = FALSE;
+            bUsable = sal_False;
         }
         else
         if( pVInfos[i].c_class == TrueColor )
         {
             nTrueColor = 2048;
             if( pVInfos[i].depth == 24 )
-                bUsable = TRUE;
-#ifdef TRUECOLOR8
+                bUsable = sal_True;
+#ifdef sal_TrueCOLOR8
             else if( pVInfos[i].depth == 8 )
             {
                 nTrueColor = -1; // strongly discourage 8 bit true color
-                bUsable = TRUE;
+                bUsable = sal_True;
             }
 #endif
-#ifdef TRUECOLOR15
+#ifdef sal_TrueCOLOR15
             else if( pVInfos[i].depth == 15 )
-                bUsable = TRUE;
+                bUsable = sal_True;
 #endif
-#ifdef TRUECOLOR16
+#ifdef sal_TrueCOLOR16
             else if( pVInfos[i].depth == 16 )
-                bUsable = TRUE;
+                bUsable = sal_True;
 #endif
-#ifdef TRUECOLOR32
+#ifdef sal_TrueCOLOR32
             else if( pVInfos[i].depth == 32 )
             {
                 nTrueColor = 256;
                 // we do not have use for an alpha channel
                 // better use a 24 or 16 bit truecolor visual if possible
-                bUsable = TRUE;
+                bUsable = sal_True;
             }
 #endif
         }
         else if( pVInfos[i].c_class == PseudoColor )
         {
             if( pVInfos[i].depth <= 8 )
-                bUsable = TRUE;
+                bUsable = sal_True;
 #ifdef PSEUDOCOLOR12
             else if( pVInfos[i].depth == 12 )
-                bUsable = TRUE;
+                bUsable = sal_True;
 #endif
         }
         pWeight[ i ] = bUsable ? nTrueColor*pVInfos[i].depth : -1024;
@@ -638,7 +638,7 @@ fd
       GetSalData()->m_pInstance->GetYieldMutex();
   ::vos::OGuard aGuard( *pSalInstYieldMutex );
   pDisplay->Yield();
-  return TRUE;
+  return sal_True;
 }
 
 SalX11Display::SalX11Display( Display *display )
@@ -846,9 +846,9 @@ void SalDisplay::Init()
     X11SalBitmap::ImplCreateCache();
 
     hEventGuard_    = osl_createMutex();
-    bLocal_         = FALSE; /* dont care, initialize later by
+    bLocal_         = sal_False; /* dont care, initialize later by
                                 calling SalDisplay::IsLocal() */
-    mbLocalIsValid  = FALSE; /* bLocal_ is not yet initialized */
+    mbLocalIsValid  = sal_False; /* bLocal_ is not yet initialized */
 
     // - - - - - - - - - - Synchronize - - - - - - - - - - - - -
     if( getenv( "SAL_SYNCHRONIZE" ) )
@@ -1096,7 +1096,7 @@ void SalDisplay::ModifierMapping()
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-XubString SalDisplay::GetKeyName( USHORT nKeyCode ) const
+XubString SalDisplay::GetKeyName( sal_uInt16 nKeyCode ) const
 {
     String aStrMap;
 
@@ -1279,27 +1279,27 @@ XubString SalDisplay::GetKeyName( USHORT nKeyCode ) const
 #define IsISOKey( n ) (0x0000FE00==((n)&0xFFFFFF00))
 #endif
 
-USHORT SalDisplay::GetKeyCode( KeySym keysym, char*pcPrintable ) const
+sal_uInt16 SalDisplay::GetKeyCode( KeySym keysym, char*pcPrintable ) const
 {
-    USHORT nKey = 0;
+    sal_uInt16 nKey = 0;
 
     if( XK_a <= keysym && XK_z >= keysym )
-        nKey = (USHORT)(KEY_A + (keysym - XK_a));
+        nKey = (sal_uInt16)(KEY_A + (keysym - XK_a));
     else if( XK_A <= keysym && XK_Z >= keysym )
-        nKey = (USHORT)(KEY_A + (keysym - XK_A));
+        nKey = (sal_uInt16)(KEY_A + (keysym - XK_A));
     else if( XK_0 <= keysym && XK_9 >= keysym )
-        nKey = (USHORT)(KEY_0 + (keysym - XK_0));
+        nKey = (sal_uInt16)(KEY_0 + (keysym - XK_0));
     else if( IsModifierKey( keysym ) )
         ;
     else if( IsKeypadKey( keysym ) )
     {
         if( (keysym >= XK_KP_0) && (keysym <= XK_KP_9) )
         {
-            nKey = (USHORT)(KEY_0 + (keysym - XK_KP_0));
+            nKey = (sal_uInt16)(KEY_0 + (keysym - XK_KP_0));
             *pcPrintable = '0' + nKey - KEY_0;
         }
         else if( IsPFKey( keysym ) )
-            nKey = (USHORT)(KEY_F1 + (keysym - XK_KP_F1));
+            nKey = (sal_uInt16)(KEY_F1 + (keysym - XK_KP_F1));
         else switch( keysym )
         {
             case XK_KP_Space:
@@ -1378,7 +1378,7 @@ USHORT SalDisplay::GetKeyCode( KeySym keysym, char*pcPrintable ) const
         if( bNumLockFromXS_ )
         {
             if( keysym >= XK_F1 && keysym <= XK_F26 )
-                nKey = (USHORT)(KEY_F1 + keysym - XK_F1);
+                nKey = (sal_uInt16)(KEY_F1 + keysym - XK_F1);
         }
         else switch( keysym )
         {
@@ -1447,7 +1447,7 @@ USHORT SalDisplay::GetKeyCode( KeySym keysym, char*pcPrintable ) const
                 break;
             default:
                 if( keysym >= XK_F1 && keysym <= XK_F26 )
-                    nKey = (USHORT)(KEY_F1 + keysym - XK_F1);
+                    nKey = (sal_uInt16)(KEY_F1 + keysym - XK_F1);
                 break;
         }
     }
@@ -2148,7 +2148,7 @@ int SalDisplay::CaptureMouse( SalFrame *pCapture )
 // Events
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-void SalDisplay::SendInternalEvent( SalFrame* pFrame, void* pData, USHORT nEvent )
+void SalDisplay::SendInternalEvent( SalFrame* pFrame, void* pData, sal_uInt16 nEvent )
 {
     if( osl_acquireMutex( hEventGuard_ ) )
     {
@@ -2164,7 +2164,7 @@ void SalDisplay::SendInternalEvent( SalFrame* pFrame, void* pData, USHORT nEvent
     }
 }
 
-void SalDisplay::CancelInternalEvent( SalFrame* pFrame, void* pData, USHORT nEvent )
+void SalDisplay::CancelInternalEvent( SalFrame* pFrame, void* pData, sal_uInt16 nEvent )
 {
     if( osl_acquireMutex( hEventGuard_ ) )
     {
@@ -2191,29 +2191,29 @@ void SalDisplay::CancelInternalEvent( SalFrame* pFrame, void* pData, USHORT nEve
     }
 }
 
-BOOL SalX11Display::IsEvent()
+sal_Bool SalX11Display::IsEvent()
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if( osl_acquireMutex( hEventGuard_ ) )
     {
         if( m_aUserEvents.begin() != m_aUserEvents.end() )
-            bRet = TRUE;
+            bRet = sal_True;
         osl_releaseMutex( hEventGuard_ );
     }
 
     if( bRet || XEventsQueued( pDisp_, QueuedAlready ) )
-        return TRUE;
+        return sal_True;
 
     XFlush( pDisp_ );
-    return FALSE;
+    return sal_False;
 }
 
 bool SalDisplay::DispatchInternalEvent()
 {
     SalFrame* pFrame = NULL;
     void* pData = NULL;
-    USHORT nEvent = 0;
+    sal_uInt16 nEvent = 0;
 
     if( osl_acquireMutex( hEventGuard_ ) )
     {
@@ -2325,7 +2325,7 @@ long SalX11Display::Dispatch( XEvent *pEvent )
                 if( MappingModifier == pEvent->xmapping.request )
                     ModifierMapping();
                 if( MappingKeyboard == pEvent->xmapping.request ) // refresh mapping
-                    GetKeyboardName( TRUE );
+                    GetKeyboardName( sal_True );
             }
             break;
         case ButtonPress:
@@ -2845,14 +2845,14 @@ SalVisual::~SalVisual()
 #define SALCOLOR        RGB
 #define SALCOLORREVERSE BGR
 
-BOOL SalVisual::Convert( int &n0, int &n1, int &n2, int &n3 )
+sal_Bool SalVisual::Convert( int &n0, int &n1, int &n2, int &n3 )
 {
     int n;
 
     switch( GetMode() )
     {
         case other:
-            return FALSE;
+            return sal_False;
         case SALCOLOR:
             break;
         case SALCOLORREVERSE:
@@ -2877,17 +2877,17 @@ BOOL SalVisual::Convert( int &n0, int &n1, int &n2, int &n3 )
             fprintf( stderr, "SalVisual::Convert %d\n", GetMode() );
             abort();
     }
-    return TRUE;
+    return sal_True;
 }
 
-BOOL SalVisual::Convert( int &n0, int &n1, int &n2 )
+sal_Bool SalVisual::Convert( int &n0, int &n1, int &n2 )
 {
     int n;
 
     switch( GetMode() )
     {
         case other:
-            return FALSE;
+            return sal_False;
         case SALCOLOR:
             break;
         case RBG:
@@ -2921,7 +2921,7 @@ BOOL SalVisual::Convert( int &n0, int &n1, int &n2 )
             fprintf( stderr, "SalVisual::Convert %d\n", GetMode() );
             abort();
     }
-    return TRUE;
+    return sal_True;
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -3093,7 +3093,7 @@ SalColormap::SalColormap()
 }
 
 // TrueColor
-SalColormap::SalColormap( USHORT nDepth )
+SalColormap::SalColormap( sal_uInt16 nDepth )
     : m_pDisplay( GetX11SalData()->GetDisplay() ),
       m_hColormap( None ),
       m_nWhitePixel( (1 << nDepth) - 1 ),
@@ -3243,14 +3243,14 @@ void SalColormap::GetPalette()
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-static USHORT sal_Lookup( const std::vector<SalColor>& rPalette,
+static sal_uInt16 sal_Lookup( const std::vector<SalColor>& rPalette,
                                 int r, int g, int b,
                                 Pixel nUsed )
 {
-    USHORT nPixel = 0;
+    sal_uInt16 nPixel = 0;
     int    nBest  = ColorDiff( rPalette[0], r, g, b );
 
-    for( USHORT i = 1; i < nUsed; i++ )
+    for( sal_uInt16 i = 1; i < nUsed; i++ )
     {
         int n = ColorDiff( rPalette[i], r, g, b );
 
@@ -3268,7 +3268,7 @@ static USHORT sal_Lookup( const std::vector<SalColor>& rPalette,
 
 void SalColormap::GetLookupTable()
 {
-    m_aLookupTable = std::vector<USHORT>(16*16*16);
+    m_aLookupTable = std::vector<sal_uInt16>(16*16*16);
 
     int i = 0;
     for( int r = 0; r < 256; r += 17 )
@@ -3318,7 +3318,7 @@ SalColor SalColormap::GetColor( Pixel nPixel ) const
     return MAKE_SALCOLOR( aColor.red>>8, aColor.green>>8, aColor.blue>>8 );
 }
 
-inline BOOL SalColormap::GetXPixel( XColor &rColor,
+inline sal_Bool SalColormap::GetXPixel( XColor &rColor,
                                           int     r,
                                           int     g,
                                           int     b ) const
@@ -3329,15 +3329,15 @@ inline BOOL SalColormap::GetXPixel( XColor &rColor,
     return XAllocColor( GetXDisplay(), m_hColormap, &rColor );
 }
 
-BOOL SalColormap::GetXPixels( XColor &rColor,
+sal_Bool SalColormap::GetXPixels( XColor &rColor,
                                     int     r,
                                     int     g,
                                     int     b ) const
 {
     if( !GetXPixel( rColor, r, g, b ) )
-        return FALSE;
+        return sal_False;
     if( rColor.pixel & 1 )
-        return TRUE;
+        return sal_True;
     return GetXPixel( rColor, r^0xFF, g^0xFF, b^0xFF );
 }
 
@@ -3425,9 +3425,9 @@ Pixel SalColormap::GetPixel( SalColor nSalColor ) const
     }
 
     // Colormatching ueber Palette
-    USHORT r = SALCOLOR_RED  ( nSalColor );
-    USHORT g = SALCOLOR_GREEN( nSalColor );
-    USHORT b = SALCOLOR_BLUE ( nSalColor );
+    sal_uInt16 r = SALCOLOR_RED  ( nSalColor );
+    sal_uInt16 g = SALCOLOR_GREEN( nSalColor );
+    sal_uInt16 b = SALCOLOR_BLUE ( nSalColor );
     return m_aLookupTable[ (((r+8)/17) << 8)
                          + (((g+8)/17) << 4)
                          +  ((b+8)/17) ];
diff --git a/vcl/unx/source/app/salinst.cxx b/vcl/unx/source/app/salinst.cxx
index f125d5f98fa6..8814e6c65f89 100644
--- a/vcl/unx/source/app/salinst.cxx
+++ b/vcl/unx/source/app/salinst.cxx
@@ -149,8 +149,8 @@ X11SalInstance::~X11SalInstance()
 
 struct PredicateReturn
 {
-    USHORT  nType;
-    BOOL    bRet;
+    sal_uInt16  nType;
+    sal_Bool    bRet;
 };
 
 extern "C" {
@@ -161,7 +161,7 @@ Bool ImplPredicateEvent( Display *, XEvent *pEvent, char *pData )
     if ( pPre->bRet )
         return False;
 
-    USHORT nType;
+    sal_uInt16 nType;
 
     switch( pEvent->type )
     {
@@ -187,29 +187,29 @@ Bool ImplPredicateEvent( Display *, XEvent *pEvent, char *pData )
     }
 
     if ( (nType & pPre->nType) || ( ! nType && (pPre->nType & INPUT_OTHER) ) )
-        pPre->bRet = TRUE;
+        pPre->bRet = sal_True;
 
     return False;
 }
 }
 
-bool X11SalInstance::AnyInput(USHORT nType)
+bool X11SalInstance::AnyInput(sal_uInt16 nType)
 {
     X11SalData *pSalData = GetX11SalData();
     Display *pDisplay  = pSalData->GetDisplay()->GetDisplay();
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if( (nType & INPUT_TIMER) &&
         pSalData->GetDisplay()->GetXLib()->CheckTimeout( false ) )
     {
-        bRet = TRUE;
+        bRet = sal_True;
     }
     else if (XPending(pDisplay) )
     {
         PredicateReturn aInput;
         XEvent          aEvent;
 
-        aInput.bRet     = FALSE;
+        aInput.bRet     = sal_False;
         aInput.nType    = nType;
 
         XCheckIfEvent(pDisplay, &aEvent, ImplPredicateEvent,
@@ -227,14 +227,14 @@ vos::IMutex* X11SalInstance::GetYieldMutex()
 
 // -----------------------------------------------------------------------
 
-ULONG X11SalInstance::ReleaseYieldMutex()
+sal_uLong X11SalInstance::ReleaseYieldMutex()
 {
     SalYieldMutex* pYieldMutex = mpSalYieldMutex;
     if ( pYieldMutex->GetThreadId() ==
          vos::OThread::getCurrentIdentifier() )
     {
-        ULONG nCount = pYieldMutex->GetAcquireCount();
-        ULONG n = nCount;
+        sal_uLong nCount = pYieldMutex->GetAcquireCount();
+        sal_uLong n = nCount;
         while ( n )
         {
             pYieldMutex->release();
@@ -249,7 +249,7 @@ ULONG X11SalInstance::ReleaseYieldMutex()
 
 // -----------------------------------------------------------------------
 
-void X11SalInstance::AcquireYieldMutex( ULONG nCount )
+void X11SalInstance::AcquireYieldMutex( sal_uLong nCount )
 {
     SalYieldMutex* pYieldMutex = mpSalYieldMutex;
     while ( nCount )
@@ -288,14 +288,14 @@ void* X11SalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rReturn
     return pDisplay ? (void*)pDisplay : (void*)"";
 }
 
-SalFrame *X11SalInstance::CreateFrame( SalFrame *pParent, ULONG nSalFrameStyle )
+SalFrame *X11SalInstance::CreateFrame( SalFrame *pParent, sal_uLong nSalFrameStyle )
 {
     SalFrame *pFrame = new X11SalFrame( pParent, nSalFrameStyle );
 
     return pFrame;
 }
 
-SalFrame* X11SalInstance::CreateChildFrame( SystemParentData* pParentData, ULONG nStyle )
+SalFrame* X11SalInstance::CreateChildFrame( SystemParentData* pParentData, sal_uLong nStyle )
 {
     SalFrame* pFrame = new X11SalFrame( NULL, nStyle, pParentData );
 
diff --git a/vcl/unx/source/app/salsys.cxx b/vcl/unx/source/app/salsys.cxx
index 84c9dba32e40..5e2b870f559f 100644
--- a/vcl/unx/source/app/salsys.cxx
+++ b/vcl/unx/source/app/salsys.cxx
@@ -152,13 +152,13 @@ int X11SalSystem::ShowNativeDialog( const String& rTitle, const String& rMessage
     aWarn.SetText( rTitle );
     aWarn.Clear();
 
-    USHORT nButton = 0;
+    sal_uInt16 nButton = 0;
     for( std::list< String >::const_iterator it = rButtons.begin(); it != rButtons.end(); ++it )
     {
-            aWarn.AddButton( *it, nButton+1, nButton == (USHORT)nDefButton ? BUTTONDIALOG_DEFBUTTON : 0 );
+            aWarn.AddButton( *it, nButton+1, nButton == (sal_uInt16)nDefButton ? BUTTONDIALOG_DEFBUTTON : 0 );
             nButton++;
     }
-    aWarn.SetFocusButton( (USHORT)nDefButton+1 );
+    aWarn.SetFocusButton( (sal_uInt16)nDefButton+1 );
 
     nRet = ((int)aWarn.Execute()) - 1;
 
diff --git a/vcl/unx/source/app/saltimer.cxx b/vcl/unx/source/app/saltimer.cxx
index 431470935d9e..1085967f74a2 100644
--- a/vcl/unx/source/app/saltimer.cxx
+++ b/vcl/unx/source/app/saltimer.cxx
@@ -58,7 +58,7 @@ void SalXLib::StopTimer()
     m_nTimeoutMS        = 0;
 }
 
-void SalXLib::StartTimer( ULONG nMS )
+void SalXLib::StartTimer( sal_uLong nMS )
 {
     timeval Timeout (m_aTimeout); // previous timeout.
     gettimeofday (&m_aTimeout, 0);
@@ -89,7 +89,7 @@ void X11SalTimer::Stop()
     GetX11SalData()->GetLib()->StopTimer();
 }
 
-void X11SalTimer::Start( ULONG nMS )
+void X11SalTimer::Start( sal_uLong nMS )
 {
     GetX11SalData()->GetLib()->StartTimer( nMS );
 }
diff --git a/vcl/unx/source/app/sm.cxx b/vcl/unx/source/app/sm.cxx
index 959d6af5912d..21d9b8df60f3 100644
--- a/vcl/unx/source/app/sm.cxx
+++ b/vcl/unx/source/app/sm.cxx
@@ -149,7 +149,7 @@ extern "C" void SAL_CALL ICEConnectionWorker( void* );
 class ICEConnectionObserver
 {
     friend void SAL_CALL ICEConnectionWorker(void*);
-    static BOOL bIsWatching;
+    static sal_Bool bIsWatching;
     static void ICEWatchProc( IceConn connection, IcePointer client_data,
                               Bool opening, IcePointer* watch_data );
 
@@ -175,7 +175,7 @@ public:
 
 SmcConn             SessionManagerClient::aSmcConnection            = NULL;
 ByteString          SessionManagerClient::aClientID;
-BOOL                ICEConnectionObserver::bIsWatching              = FALSE;
+sal_Bool                ICEConnectionObserver::bIsWatching              = sal_False;
 struct pollfd*  ICEConnectionObserver::pFilehandles             = NULL;
 IceConn*            ICEConnectionObserver::pConnections             = NULL;
 int                 ICEConnectionObserver::nConnections             = 0;
@@ -606,7 +606,7 @@ void ICEConnectionObserver::activate()
     {
         nWakeupFiles[0] = nWakeupFiles[1] = 0;
         ICEMutex = osl_createMutex();
-        bIsWatching = TRUE;
+        bIsWatching = sal_True;
 #ifdef USE_SM_EXTENSION
         /*
          * Default handlers call exit, we don't care that strongly if something
@@ -624,7 +624,7 @@ void ICEConnectionObserver::deactivate()
     if( bIsWatching )
     {
         lock();
-        bIsWatching = FALSE;
+        bIsWatching = sal_False;
 #ifdef USE_SM_EXTENSION
         IceRemoveConnectionWatch( ICEWatchProc, NULL );
         IceSetErrorHandler( origErrorHandler );
diff --git a/vcl/unx/source/app/soicon.cxx b/vcl/unx/source/app/soicon.cxx
index 2bf9e55731d1..ddb14e9ecc39 100644
--- a/vcl/unx/source/app/soicon.cxx
+++ b/vcl/unx/source/app/soicon.cxx
@@ -43,13 +43,13 @@
 #include <salbmp.h>
 #include <vcl/svids.hrc>
 
-BOOL SelectAppIconPixmap( SalDisplay *pDisplay, int nScreen,USHORT nIcon, USHORT iconSize,
+sal_Bool SelectAppIconPixmap( SalDisplay *pDisplay, int nScreen,sal_uInt16 nIcon, sal_uInt16 iconSize,
                           Pixmap& icon_pixmap, Pixmap& icon_mask)
 {
     if( ! ImplGetResMgr() )
-        return FALSE;
+        return sal_False;
 
-    USHORT nIconSizeOffset;
+    sal_uInt16 nIconSizeOffset;
 
     if( iconSize >= 48 )
         nIconSizeOffset = SV_ICON_SIZE48_START;
@@ -58,11 +58,11 @@ BOOL SelectAppIconPixmap( SalDisplay *pDisplay, int nScreen,USHORT nIcon, USHORT
     else if( iconSize >= 16 )
         nIconSizeOffset = SV_ICON_SIZE16_START;
     else
-        return FALSE;
+        return sal_False;
 
     BitmapEx aIcon( ResId(nIconSizeOffset + nIcon, *ImplGetResMgr()));
-    if( TRUE == aIcon.IsEmpty() )
-        return FALSE;
+    if( sal_True == aIcon.IsEmpty() )
+        return sal_False;
 
     SalTwoRect aRect;
     aRect.mnSrcX = 0; aRect.mnSrcY = 0;
@@ -110,6 +110,6 @@ BOOL SelectAppIconPixmap( SalDisplay *pDisplay, int nScreen,USHORT nIcon, USHORT
         XFreeGC( pDisplay->GetDisplay(), aMonoGC );
     }
 
-    return TRUE;
+    return sal_True;
 }
 
diff --git a/vcl/unx/source/gdi/cdeint.cxx b/vcl/unx/source/gdi/cdeint.cxx
index caa4867af874..ee0054814761 100644
--- a/vcl/unx/source/gdi/cdeint.cxx
+++ b/vcl/unx/source/gdi/cdeint.cxx
@@ -231,9 +231,9 @@ void CDEIntegrator::GetSystemLook( AllSettings& rSettings )
         {
             // calculate Checked color
             Color   aColor2 = aStyleSettings.GetLightColor();
-            BYTE    nRed    = (BYTE)(((USHORT)aColors[1].GetRed()   + (USHORT)aColor2.GetRed())/2);
-            BYTE    nGreen  = (BYTE)(((USHORT)aColors[1].GetGreen() + (USHORT)aColor2.GetGreen())/2);
-            BYTE    nBlue   = (BYTE)(((USHORT)aColors[1].GetBlue()  + (USHORT)aColor2.GetBlue())/2);
+            sal_uInt8    nRed    = (sal_uInt8)(((sal_uInt16)aColors[1].GetRed()   + (sal_uInt16)aColor2.GetRed())/2);
+            sal_uInt8    nGreen  = (sal_uInt8)(((sal_uInt16)aColors[1].GetGreen() + (sal_uInt16)aColor2.GetGreen())/2);
+            sal_uInt8    nBlue   = (sal_uInt8)(((sal_uInt16)aColors[1].GetBlue()  + (sal_uInt16)aColor2.GetBlue())/2);
             aStyleSettings.SetCheckedColor( Color( nRed, nGreen, nBlue ) );
         }
     }
diff --git a/vcl/unx/source/gdi/gcach_xpeer.cxx b/vcl/unx/source/gdi/gcach_xpeer.cxx
index a69a2426b519..9b876eb329b8 100644
--- a/vcl/unx/source/gdi/gcach_xpeer.cxx
+++ b/vcl/unx/source/gdi/gcach_xpeer.cxx
@@ -465,13 +465,13 @@ Pixmap X11GlyphPeer::GetPixmap( ServerFont& rServerFont, int nGlyphIndex, int nR
         if( rServerFont.GetGlyphBitmap1( nGlyphIndex, maRawBitmap ) )
         {
             // #94666# circumvent bug in some X11 systems, e.g. XF410.LynxEM.v163
-            ULONG nPixmapWidth = 8 * maRawBitmap.mnScanlineSize - 1;
+            sal_uLong nPixmapWidth = 8 * maRawBitmap.mnScanlineSize - 1;
             nPixmapWidth = Max( nPixmapWidth, maRawBitmap.mnWidth );
 
             rGlyphData.SetSize( Size( nPixmapWidth, maRawBitmap.mnHeight ) );
             rGlyphData.SetOffset( +maRawBitmap.mnXOffset, +maRawBitmap.mnYOffset );
 
-            const ULONG nBytes = maRawBitmap.mnHeight * maRawBitmap.mnScanlineSize;
+            const sal_uLong nBytes = maRawBitmap.mnHeight * maRawBitmap.mnScanlineSize;
             if( nBytes > 0 )
             {
                 // conversion table LSB<->MSB (for XCreatePixmapFromData)
@@ -621,7 +621,7 @@ Glyph X11GlyphPeer::GetGlyphId( ServerFont& rServerFont, int nGlyphIndex )
             GlyphSet aGlyphSet = GetGlyphSet( rServerFont, -1 );
 
             aGlyphId = nGlyphIndex & 0x00FFFFFF;
-            const ULONG nBytes = maRawBitmap.mnScanlineSize * maRawBitmap.mnHeight;
+            const sal_uLong nBytes = maRawBitmap.mnScanlineSize * maRawBitmap.mnHeight;
             XRenderPeer::GetInstance().AddGlyph( aGlyphSet, aGlyphId,
                 aGlyphInfo, (char*)maRawBitmap.mpBits, nBytes );
             mnBytesUsed += nBytes;
diff --git a/vcl/unx/source/gdi/pspgraphics.cxx b/vcl/unx/source/gdi/pspgraphics.cxx
index bab78b0cb2df..0edf2326b58d 100644
--- a/vcl/unx/source/gdi/pspgraphics.cxx
+++ b/vcl/unx/source/gdi/pspgraphics.cxx
@@ -278,7 +278,7 @@ void PspGraphics::GetResolution( sal_Int32 &rDPIX, sal_Int32 &rDPIY )
     }
 }
 
-USHORT PspGraphics::GetBitCount()
+sal_uInt16 PspGraphics::GetBitCount()
 {
     return m_pPrinterGfx->GetBitCount();
 }
@@ -293,14 +293,14 @@ void PspGraphics::ResetClipRegion()
     m_pPrinterGfx->ResetClipRegion ();
 }
 
-void PspGraphics::BeginSetClipRegion( ULONG n )
+void PspGraphics::BeginSetClipRegion( sal_uLong n )
 {
     m_pPrinterGfx->BeginSetClipRegion(n);
 }
 
-BOOL PspGraphics::unionClipRegion( long nX, long nY, long nDX, long nDY )
+sal_Bool PspGraphics::unionClipRegion( long nX, long nY, long nDX, long nDY )
 {
-    return (BOOL)m_pPrinterGfx->UnionClipRegion (nX, nY, nDX, nDY);
+    return (sal_Bool)m_pPrinterGfx->UnionClipRegion (nX, nY, nDX, nDY);
 }
 
 bool PspGraphics::unionClipRegion( const ::basegfx::B2DPolyPolygon& )
@@ -379,12 +379,12 @@ void PspGraphics::drawRect( long nX, long nY, long nDX, long nDY )
     m_pPrinterGfx->DrawRect (Rectangle(Point(nX, nY), Size(nDX, nDY)));
 }
 
-void PspGraphics::drawPolyLine( ULONG nPoints, const SalPoint *pPtAry )
+void PspGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry )
 {
     m_pPrinterGfx->DrawPolyLine (nPoints, (Point*)pPtAry);
 }
 
-void PspGraphics::drawPolygon( ULONG nPoints, const SalPoint* pPtAry )
+void PspGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
 {
     // Point must be equal to SalPoint! see vcl/inc/salgtype.hxx
     m_pPrinterGfx->DrawPolygon (nPoints, (Point*)pPtAry);
@@ -409,13 +409,13 @@ bool PspGraphics::drawPolyLine( const basegfx::B2DPolygon&, double /*fTransparen
     return false;
 }
 
-sal_Bool PspGraphics::drawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry )
+sal_Bool PspGraphics::drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
 {
     m_pPrinterGfx->DrawPolyLineBezier (nPoints, (Point*)pPtAry, pFlgAry);
     return sal_True;
 }
 
-sal_Bool PspGraphics::drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry )
+sal_Bool PspGraphics::drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
 {
     m_pPrinterGfx->DrawPolygonBezier (nPoints, (Point*)pPtAry, pFlgAry);
     return sal_True;
@@ -424,20 +424,20 @@ sal_Bool PspGraphics::drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry,
 sal_Bool PspGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly,
                                              const sal_uInt32* pPoints,
                                              const SalPoint* const* pPtAry,
-                                             const BYTE* const* pFlgAry )
+                                             const sal_uInt8* const* pFlgAry )
 {
     // Point must be equal to SalPoint! see vcl/inc/salgtype.hxx
-    m_pPrinterGfx->DrawPolyPolygonBezier (nPoly, pPoints, (Point**)pPtAry, (BYTE**)pFlgAry);
+    m_pPrinterGfx->DrawPolyPolygonBezier (nPoly, pPoints, (Point**)pPtAry, (sal_uInt8**)pFlgAry);
     return sal_True;
 }
 
-void PspGraphics::invert( ULONG,
+void PspGraphics::invert( sal_uLong,
                           const SalPoint*,
                           SalInvert )
 {
     DBG_ASSERT( 0, "Error: PrinterGfx::Invert() not implemented" );
 }
-BOOL PspGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize )
+sal_Bool PspGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize )
 {
     return m_pPrinterGfx->DrawEPS( Rectangle( Point( nX, nY ), Size( nWidth, nHeight ) ), pPtr, nSize );
 }
@@ -448,7 +448,7 @@ void PspGraphics::copyBits( const SalTwoRect*,
     DBG_ERROR( "Error: PrinterGfx::CopyBits() not implemented" );
 }
 
-void PspGraphics::copyArea ( long,long,long,long,long,long,USHORT )
+void PspGraphics::copyArea ( long,long,long,long,long,long,sal_uInt16 )
 {
     DBG_ERROR( "Error: PrinterGfx::CopyArea() not implemented" );
 }
@@ -784,7 +784,7 @@ const ImplFontCharMap* PspGraphics::GetImplFontCharMap() const
     return pIFCMap;
 }
 
-USHORT PspGraphics::SetFont( ImplFontSelectData *pEntry, int nFallbackLevel )
+sal_uInt16 PspGraphics::SetFont( ImplFontSelectData *pEntry, int nFallbackLevel )
 {
     // release all fonts that are to be overridden
     for( int i = nFallbackLevel; i < MAX_FALLBACK; ++i )
@@ -915,10 +915,10 @@ void PspGraphics::GetFontMetric( ImplFontMetricData *pMetric, int )
     }
 }
 
-ULONG PspGraphics::GetKernPairs( ULONG nPairs, ImplKernPairData *pKernPairs )
+sal_uLong PspGraphics::GetKernPairs( sal_uLong nPairs, ImplKernPairData *pKernPairs )
 {
     const ::std::list< ::psp::KernPair >& rPairs( m_pPrinterGfx->getKernPairs() );
-    ULONG nHavePairs = rPairs.size();
+    sal_uLong nHavePairs = rPairs.size();
     if( pKernPairs && nPairs )
     {
         ::std::list< ::psp::KernPair >::const_iterator it;
@@ -937,38 +937,38 @@ ULONG PspGraphics::GetKernPairs( ULONG nPairs, ImplKernPairData *pKernPairs )
     return nHavePairs;
 }
 
-BOOL PspGraphics::GetGlyphBoundRect( long nGlyphIndex, Rectangle& rRect )
+sal_Bool PspGraphics::GetGlyphBoundRect( long nGlyphIndex, Rectangle& rRect )
 {
     int nLevel = nGlyphIndex >> GF_FONTSHIFT;
     if( nLevel >= MAX_FALLBACK )
-        return FALSE;
+        return sal_False;
 
     ServerFont* pSF = m_pServerFont[ nLevel ];
     if( !pSF )
-        return FALSE;
+        return sal_False;
 
     nGlyphIndex &= ~GF_FONTMASK;
     const GlyphMetric& rGM = pSF->GetGlyphMetric( nGlyphIndex );
     rRect = Rectangle( rGM.GetOffset(), rGM.GetSize() );
-    return TRUE;
+    return sal_True;
 }
 
-BOOL PspGraphics::GetGlyphOutline( long nGlyphIndex,
+sal_Bool PspGraphics::GetGlyphOutline( long nGlyphIndex,
     ::basegfx::B2DPolyPolygon& rB2DPolyPoly )
 {
     int nLevel = nGlyphIndex >> GF_FONTSHIFT;
     if( nLevel >= MAX_FALLBACK )
-        return FALSE;
+        return sal_False;
 
     ServerFont* pSF = m_pServerFont[ nLevel ];
     if( !pSF )
-        return FALSE;
+        return sal_False;
 
     nGlyphIndex &= ~GF_FONTMASK;
     if( pSF->GetGlyphOutline( nGlyphIndex, rB2DPolyPoly ) )
-        return TRUE;
+        return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 SalLayout* PspGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel )
@@ -1007,7 +1007,7 @@ SalLayout* PspGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel
 
 //--------------------------------------------------------------------------
 
-BOOL PspGraphics::CreateFontSubset(
+sal_Bool PspGraphics::CreateFontSubset(
                                    const rtl::OUString& rToFile,
                                    const ImplFontData* pFont,
                                    sal_Int32* pGlyphIDs,
@@ -1402,9 +1402,9 @@ bool PspGraphics::filterText( const String& rOrig, String& rNewText, xub_StrLen
     bool bRet = false;
     bool bStarted = false;
     bool bStopped = false;
-    USHORT nPos;
-    USHORT nStart = 0;
-    USHORT nStop = rLen;
+    sal_uInt16 nPos;
+    sal_uInt16 nStart = 0;
+    sal_uInt16 nStop = rLen;
     String aPhone = rOrig.Copy( nIndex, rLen );
 
     if( ! m_bPhoneCollectionActive )
diff --git a/vcl/unx/source/gdi/salbmp.cxx b/vcl/unx/source/gdi/salbmp.cxx
index cc7934b0a798..42d657b431bd 100644
--- a/vcl/unx/source/gdi/salbmp.cxx
+++ b/vcl/unx/source/gdi/salbmp.cxx
@@ -64,7 +64,7 @@ SalBitmap* X11SalInstance::CreateSalBitmap()
 }
 
 ImplSalBitmapCache* X11SalBitmap::mpCache = NULL;
-ULONG               X11SalBitmap::mnCacheInstCount = 0;
+sal_uLong               X11SalBitmap::mnCacheInstCount = 0;
 
 // -----------------------------------------------------------------------------
 
@@ -109,7 +109,7 @@ void X11SalBitmap::ImplRemovedFromCache()
 
 // -----------------------------------------------------------------------------
 
-BitmapBuffer* X11SalBitmap::ImplCreateDIB( const Size& rSize, USHORT nBitCount, const BitmapPalette& rPal )
+BitmapBuffer* X11SalBitmap::ImplCreateDIB( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal )
 {
     DBG_ASSERT( nBitCount == 1 || nBitCount == 4 || nBitCount == 8 || nBitCount == 16 || nBitCount == 24, "Unsupported BitCount!" );
 
@@ -128,7 +128,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( const Size& rSize, USHORT nBitCount,
 
         if( pDIB )
         {
-            const USHORT nColors = ( nBitCount <= 8 ) ? ( 1 << nBitCount ) : 0;
+            const sal_uInt16 nColors = ( nBitCount <= 8 ) ? ( 1 << nBitCount ) : 0;
 
             pDIB->mnFormat = BMP_FORMAT_BOTTOM_UP;
 
@@ -169,7 +169,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( const Size& rSize, USHORT nBitCount,
 
             try
             {
-                pDIB->mpBits = new BYTE[ pDIB->mnScanlineSize * pDIB->mnHeight ];
+                pDIB->mpBits = new sal_uInt8[ pDIB->mnScanlineSize * pDIB->mnHeight ];
             }
             catch(std::bad_alloc&)
             {
@@ -214,7 +214,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( Drawable aDrawable,
         {
             const SalTwoRect        aTwoRect = { 0, 0, nWidth, nHeight, 0, 0, nWidth, nHeight };
             BitmapBuffer            aSrcBuf;
-            ULONG                   nDstFormat = BMP_FORMAT_BOTTOM_UP;
+            sal_uLong                   nDstFormat = BMP_FORMAT_BOTTOM_UP;
             const BitmapPalette*    pDstPal = NULL;
 
             aSrcBuf.mnFormat = BMP_FORMAT_TOP_DOWN;
@@ -222,7 +222,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( Drawable aDrawable,
             aSrcBuf.mnHeight = nHeight;
             aSrcBuf.mnBitCount = pImage->bits_per_pixel;
             aSrcBuf.mnScanlineSize = pImage->bytes_per_line;
-            aSrcBuf.mpBits = (BYTE*) pImage->data;
+            aSrcBuf.mpBits = (sal_uInt8*) pImage->data;
 
             pImage->red_mask = pSalDisp->GetVisual( nScreen ).red_mask;
             pImage->green_mask = pSalDisp->GetVisual( nScreen ).green_mask;
@@ -304,12 +304,12 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( Drawable aDrawable,
             else if( aSrcBuf.mnBitCount <= 8 )
             {
                 const SalColormap& rColMap = pSalDisp->GetColormap( nScreen );
-                const USHORT nCols = Min( (ULONG)rColMap.GetUsed(), (ULONG)(1 << nDrawableDepth) );
+                const sal_uInt16 nCols = Min( (sal_uLong)rColMap.GetUsed(), (sal_uLong)(1 << nDrawableDepth) );
 
                 rPal.SetEntryCount( nCols );
                 pDstPal = &rPal;
 
-                for( USHORT i = 0; i < nCols; i++ )
+                for( sal_uInt16 i = 0; i < nCols; i++ )
                 {
                     const SalColor  nColor( rColMap.GetColor( i ) );
                     BitmapColor&    rBmpCol = rPal[ i ];
@@ -363,7 +363,7 @@ XImage* X11SalBitmap::ImplCreateXImage( SalDisplay *pSalDisp, int nScreen, long
         if( pImage )
         {
             BitmapBuffer*   pDstBuf;
-            ULONG           nDstFormat = BMP_FORMAT_TOP_DOWN;
+            sal_uLong           nDstFormat = BMP_FORMAT_TOP_DOWN;
             BitmapPalette*  pPal = NULL;
             ColorMask*      pMask = NULL;
 
@@ -430,11 +430,11 @@ XImage* X11SalBitmap::ImplCreateXImage( SalDisplay *pSalDisp, int nScreen, long
             else if( pImage->depth <= 8 )
             {
                 const SalColormap& rColMap = pSalDisp->GetColormap( nScreen );
-                const USHORT nCols = Min( (ULONG)rColMap.GetUsed(), (ULONG)(1 << pImage->depth) );
+                const sal_uInt16 nCols = Min( (sal_uLong)rColMap.GetUsed(), (sal_uLong)(1 << pImage->depth) );
 
                 pPal = new BitmapPalette( nCols );
 
-                for( USHORT i = 0; i < nCols; i++ )
+                for( sal_uInt16 i = 0; i < nCols; i++ )
                 {
                     const SalColor  nColor( rColMap.GetColor( i ) );
                     BitmapColor&    rBmpCol = (*pPal)[ i ];
@@ -683,7 +683,7 @@ void X11SalBitmap::ImplDraw( Drawable           aDrawable,
 
 // -----------------------------------------------------------------------------
 
-bool X11SalBitmap::Create( const Size& rSize, USHORT nBitCount, const BitmapPalette& rPal )
+bool X11SalBitmap::Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal )
 {
     Destroy();
     mpDIB = ImplCreateDIB( rSize, nBitCount, rPal );
@@ -706,7 +706,7 @@ bool X11SalBitmap::Create( const SalBitmap& rSSalBmp )
         // TODO: get rid of this when BitmapBuffer gets copy constructor
         try
         {
-            mpDIB->mpBits = new BYTE[ mpDIB->mnScanlineSize * mpDIB->mnHeight ];
+            mpDIB->mpBits = new sal_uInt8[ mpDIB->mnScanlineSize * mpDIB->mnHeight ];
         }
         catch( std::bad_alloc& )
         {
@@ -732,14 +732,14 @@ bool X11SalBitmap::Create( const SalBitmap& rSSalBmp )
 
 bool X11SalBitmap::Create( const SalBitmap&, SalGraphics* )
 {
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------------
 
-bool X11SalBitmap::Create( const SalBitmap&, USHORT )
+bool X11SalBitmap::Create( const SalBitmap&, sal_uInt16 )
 {
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------------
@@ -775,9 +775,9 @@ Size X11SalBitmap::GetSize() const
 
 // -----------------------------------------------------------------------------
 
-USHORT X11SalBitmap::GetBitCount() const
+sal_uInt16 X11SalBitmap::GetBitCount() const
 {
-    USHORT nBitCount;
+    sal_uInt16 nBitCount;
 
     if( mpDIB )
         nBitCount = mpDIB->mnBitCount;
@@ -954,7 +954,7 @@ ImplSalDDB::~ImplSalDDB()
 
 bool ImplSalDDB::ImplMatches( int nScreen, long nDepth, const SalTwoRect& rTwoRect ) const
 {
-    bool bRet = FALSE;
+    bool bRet = sal_False;
 
     if( ( maPixmap != 0 ) && ( ( mnDepth == nDepth ) || ( 1 == mnDepth ) ) && nScreen == mnScreen)
     {
@@ -963,7 +963,7 @@ bool ImplSalDDB::ImplMatches( int nScreen, long nDepth, const SalTwoRect& rTwoRe
             rTwoRect.mnDestWidth == maTwoRect.mnDestWidth && rTwoRect.mnDestHeight == maTwoRect.mnDestHeight )
         {
             // absolutely indentically
-            bRet = TRUE;
+            bRet = sal_True;
         }
         else if( rTwoRect.mnSrcWidth == rTwoRect.mnDestWidth && rTwoRect.mnSrcHeight == rTwoRect.mnDestHeight &&
                  maTwoRect.mnSrcWidth == maTwoRect.mnDestWidth && maTwoRect.mnSrcHeight == maTwoRect.mnDestHeight &&
@@ -971,7 +971,7 @@ bool ImplSalDDB::ImplMatches( int nScreen, long nDepth, const SalTwoRect& rTwoRe
                  ( rTwoRect.mnSrcX + rTwoRect.mnSrcWidth ) <= ( maTwoRect.mnSrcX + maTwoRect.mnSrcWidth ) &&
                  ( rTwoRect.mnSrcY + rTwoRect.mnSrcHeight ) <= ( maTwoRect.mnSrcY + maTwoRect.mnSrcHeight ) )
         {
-            bRet = TRUE;
+            bRet = sal_True;
         }
     }
 
@@ -1018,10 +1018,10 @@ void ImplSalDDB::ImplDraw( Drawable aSrcDrawable, long nSrcDrawableDepth,
 struct ImplBmpObj
 {
     X11SalBitmap*   mpBmp;
-    ULONG       mnMemSize;
-    ULONG       mnFlags;
+    sal_uLong       mnMemSize;
+    sal_uLong       mnFlags;
 
-                ImplBmpObj( X11SalBitmap* pBmp, ULONG nMemSize, ULONG nFlags ) :
+                ImplBmpObj( X11SalBitmap* pBmp, sal_uLong nMemSize, sal_uLong nFlags ) :
                     mpBmp( pBmp ), mnMemSize( nMemSize ), mnFlags( nFlags ) {}
 };
 
@@ -1041,14 +1041,14 @@ ImplSalBitmapCache::~ImplSalBitmapCache()
 
 // -----------------------------------------------------------------------------
 
-void ImplSalBitmapCache::ImplAdd( X11SalBitmap* pBmp, ULONG nMemSize, ULONG nFlags )
+void ImplSalBitmapCache::ImplAdd( X11SalBitmap* pBmp, sal_uLong nMemSize, sal_uLong nFlags )
 {
     ImplBmpObj* pObj;
-    bool        bFound = FALSE;
+    bool        bFound = sal_False;
 
     for( pObj = (ImplBmpObj*) maBmpList.Last(); pObj && !bFound; pObj = (ImplBmpObj*) maBmpList.Prev() )
         if( pObj->mpBmp == pBmp )
-            bFound = TRUE;
+            bFound = sal_True;
 
     mnTotalSize += nMemSize;
 
diff --git a/vcl/unx/source/gdi/salgdi.cxx b/vcl/unx/source/gdi/salgdi.cxx
index 9dfbfff22d03..979e3927024a 100644
--- a/vcl/unx/source/gdi/salgdi.cxx
+++ b/vcl/unx/source/gdi/salgdi.cxx
@@ -67,21 +67,21 @@ class SalPolyLine
             XPoint              Points_[STATIC_POINTS];
             XPoint             *pFirst_;
 public:
-    inline                      SalPolyLine( ULONG nPoints );
-    inline                      SalPolyLine( ULONG nPoints, const SalPoint *p );
+    inline                      SalPolyLine( sal_uLong nPoints );
+    inline                      SalPolyLine( sal_uLong nPoints, const SalPoint *p );
     inline                      ~SalPolyLine();
-    inline  XPoint             &operator [] ( ULONG n ) const
+    inline  XPoint             &operator [] ( sal_uLong n ) const
                                 { return pFirst_[n]; }
 };
 
-inline SalPolyLine::SalPolyLine( ULONG nPoints )
+inline SalPolyLine::SalPolyLine( sal_uLong nPoints )
     : pFirst_( nPoints+1 > STATIC_POINTS ? new XPoint[nPoints+1] : Points_ )
 {}
 
-inline SalPolyLine::SalPolyLine( ULONG nPoints, const SalPoint *p )
+inline SalPolyLine::SalPolyLine( sal_uLong nPoints, const SalPoint *p )
     : pFirst_( nPoints+1 > STATIC_POINTS ? new XPoint[nPoints+1] : Points_ )
 {
-    for( ULONG i = 0; i < nPoints; i++ )
+    for( sal_uLong i = 0; i < nPoints; i++ )
     {
         pFirst_[i].x = (short)p[i].mnX;
         pFirst_[i].y = (short)p[i].mnY;
@@ -121,7 +121,7 @@ X11SalGraphics::X11SalGraphics()
 #ifdef ENABLE_GRAPHITE
     // check if graphite fonts have been disabled
     static const char* pDisableGraphiteStr = getenv( "SAL_DISABLE_GRAPHITE" );
-    bDisableGraphite_       = pDisableGraphiteStr ? (pDisableGraphiteStr[0]!='0') : FALSE;
+    bDisableGraphite_       = pDisableGraphiteStr ? (pDisableGraphiteStr[0]!='0') : sal_False;
 #endif
 
     pBrushGC_           = NULL;
@@ -137,20 +137,20 @@ X11SalGraphics::X11SalGraphics()
     pStippleGC_         = NULL;
     pTrackingGC_        = NULL;
 
-    bWindow_            = FALSE;
-    bPrinter_           = FALSE;
-    bVirDev_            = FALSE;
-    bPenGC_         = FALSE;
-    bFontGC_            = FALSE;
-    bBrushGC_           = FALSE;
-    bMonoGC_            = FALSE;
-    bCopyGC_            = FALSE;
-    bInvertGC_          = FALSE;
-    bInvert50GC_        = FALSE;
-    bStippleGC_         = FALSE;
-    bTrackingGC_        = FALSE;
-    bXORMode_           = FALSE;
-    bDitherBrush_       = FALSE;
+    bWindow_            = sal_False;
+    bPrinter_           = sal_False;
+    bVirDev_            = sal_False;
+    bPenGC_         = sal_False;
+    bFontGC_            = sal_False;
+    bBrushGC_           = sal_False;
+    bMonoGC_            = sal_False;
+    bCopyGC_            = sal_False;
+    bInvertGC_          = sal_False;
+    bInvert50GC_        = sal_False;
+    bStippleGC_         = sal_False;
+    bTrackingGC_        = sal_False;
+    bXORMode_           = sal_False;
+    bDitherBrush_       = sal_False;
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -238,7 +238,7 @@ void X11SalGraphics::Init( SalFrame *pFrame, Drawable aTarget, int nScreen )
     SetDrawable( aTarget, nScreen );
 #endif
 
-    bWindow_        = TRUE;
+    bWindow_        = sal_True;
     m_pFrame        = pFrame;
     m_pVDev         = NULL;
 }
@@ -303,7 +303,7 @@ GC X11SalGraphics::SelectPen()
             XSetForeground( pDisplay, pPenGC_, nPenPixel_ );
         XSetFunction  ( pDisplay, pPenGC_, bXORMode_ ? GXxor : GXcopy );
         SetClipRegion( pPenGC_ );
-        bPenGC_ = TRUE;
+        bPenGC_ = sal_True;
     }
 
     return pPenGC_;
@@ -351,7 +351,7 @@ GC X11SalGraphics::SelectBrush()
         XSetFunction  ( pDisplay, pBrushGC_, bXORMode_ ? GXxor : GXcopy );
         SetClipRegion( pBrushGC_ );
 
-        bBrushGC_ = TRUE;
+        bBrushGC_ = sal_True;
     }
 
     return pBrushGC_;
@@ -383,26 +383,26 @@ GC X11SalGraphics::GetTrackingGC()
     if( !bTrackingGC_ )
     {
         SetClipRegion( pTrackingGC_ );
-        bTrackingGC_ = TRUE;
+        bTrackingGC_ = sal_True;
     }
 
     return pTrackingGC_;
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalGraphics::DrawLines( ULONG              nPoints,
+void X11SalGraphics::DrawLines( sal_uLong              nPoints,
                                 const SalPolyLine &rPoints,
                                 GC                 pGC,
                                 bool               bClose
                                 )
 {
     // errechne wie viele Linien XWindow auf einmal zeichnen kann
-    ULONG nMaxLines = (GetDisplay()->GetMaxRequestSize() - sizeof(xPolyPointReq))
+    sal_uLong nMaxLines = (GetDisplay()->GetMaxRequestSize() - sizeof(xPolyPointReq))
                       / sizeof(xPoint);
     if( nMaxLines > nPoints ) nMaxLines = nPoints;
 
     // gebe alle Linien aus, die XWindows zeichnen kann.
-    ULONG n;
+    sal_uLong n;
     for( n = 0; nPoints - n > nMaxLines; n += nMaxLines - 1 )
         XDrawLines( GetXDisplay(),
                     GetDrawable(),
@@ -446,24 +446,24 @@ BOOL X11SalGraphics::GetDitherPixmap( SalColor nSalColor )
 
     // test for correct depth (8bit)
     if( GetColormap().GetVisual().GetDepth() != 8 )
-        return FALSE;
+        return sal_False;
 
     char    pBits[64];
     char   *pBitsPtr = pBits;
 
     // Set the pallette-entries for the dithering tile
-    UINT8 nSalColorRed   = SALCOLOR_RED   ( nSalColor );
-    UINT8 nSalColorGreen = SALCOLOR_GREEN ( nSalColor );
-    UINT8 nSalColorBlue  = SALCOLOR_BLUE  ( nSalColor );
+    sal_uInt8 nSalColorRed   = SALCOLOR_RED   ( nSalColor );
+    sal_uInt8 nSalColorGreen = SALCOLOR_GREEN ( nSalColor );
+    sal_uInt8 nSalColorBlue  = SALCOLOR_BLUE  ( nSalColor );
 
     for( int nY = 0; nY < 8; nY++ )
     {
         for( int nX = 0; nX < 8; nX++ )
         {
             short nMagic = nOrdDither8Bit[nY][nX];
-            UINT8 nR   = P_DELTA * DMAP( nSalColorRed,   nMagic );
-            UINT8 nG   = P_DELTA * DMAP( nSalColorGreen, nMagic );
-            UINT8 nB   = P_DELTA * DMAP( nSalColorBlue,  nMagic );
+            sal_uInt8 nR   = P_DELTA * DMAP( nSalColorRed,   nMagic );
+            sal_uInt8 nG   = P_DELTA * DMAP( nSalColorGreen, nMagic );
+            sal_uInt8 nB   = P_DELTA * DMAP( nSalColorBlue,  nMagic );
 
             *pBitsPtr++ = GetColormap().GetPixel( MAKE_SALCOLOR( nR, nG, nB ) );
         }
@@ -503,7 +503,7 @@ BOOL X11SalGraphics::GetDitherPixmap( SalColor nSalColor )
     pImage->data = NULL;
     XDestroyImage( pImage );
 
-    return TRUE;
+    return sal_True;
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -541,7 +541,7 @@ void X11SalGraphics::GetResolution( sal_Int32 &rDPIX, sal_Int32 &rDPIY ) // cons
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-USHORT X11SalGraphics::GetBitCount() // const
+sal_uInt16 X11SalGraphics::GetBitCount() // const
 {
     return GetVisual().GetDepth();
 }
@@ -573,15 +573,15 @@ void X11SalGraphics::ResetClipRegion()
 {
     if( pClipRegion_ )
     {
-        bPenGC_         = FALSE;
-        bFontGC_        = FALSE;
-        bBrushGC_       = FALSE;
-        bMonoGC_        = FALSE;
-        bCopyGC_        = FALSE;
-        bInvertGC_      = FALSE;
-        bInvert50GC_    = FALSE;
-        bStippleGC_     = FALSE;
-        bTrackingGC_    = FALSE;
+        bPenGC_         = sal_False;
+        bFontGC_        = sal_False;
+        bBrushGC_       = sal_False;
+        bMonoGC_        = sal_False;
+        bCopyGC_        = sal_False;
+        bInvertGC_      = sal_False;
+        bInvert50GC_    = sal_False;
+        bStippleGC_     = sal_False;
+        bTrackingGC_    = sal_False;
 
         XDestroyRegion( pClipRegion_ );
         pClipRegion_    = NULL;
@@ -589,7 +589,7 @@ void X11SalGraphics::ResetClipRegion()
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalGraphics::BeginSetClipRegion( ULONG )
+void X11SalGraphics::BeginSetClipRegion( sal_uLong )
 {
     if( pClipRegion_ )
         XDestroyRegion( pClipRegion_ );
@@ -600,7 +600,7 @@ void X11SalGraphics::BeginSetClipRegion( ULONG )
 BOOL X11SalGraphics::unionClipRegion( long nX, long nY, long nDX, long nDY )
 {
     if (!nDX || !nDY)
-        return TRUE;
+        return sal_True;
 
     XRectangle aRect;
     aRect.x         = (short)nX;
@@ -610,7 +610,7 @@ BOOL X11SalGraphics::unionClipRegion( long nX, long nY, long nDX, long nDY )
 
     XUnionRectWithRegion( &aRect, pClipRegion_, pClipRegion_ );
 
-    return TRUE;
+    return sal_True;
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -623,15 +623,15 @@ bool X11SalGraphics::unionClipRegion( const ::basegfx::B2DPolyPolygon& )
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 void X11SalGraphics::EndSetClipRegion()
 {
-    bPenGC_         = FALSE;
-    bFontGC_        = FALSE;
-    bBrushGC_       = FALSE;
-    bMonoGC_        = FALSE;
-    bCopyGC_        = FALSE;
-    bInvertGC_      = FALSE;
-    bInvert50GC_    = FALSE;
-    bStippleGC_     = FALSE;
-    bTrackingGC_    = FALSE;
+    bPenGC_         = sal_False;
+    bFontGC_        = sal_False;
+    bBrushGC_       = sal_False;
+    bMonoGC_        = sal_False;
+    bCopyGC_        = sal_False;
+    bInvertGC_      = sal_False;
+    bInvert50GC_    = sal_False;
+    bStippleGC_     = sal_False;
+    bTrackingGC_    = sal_False;
 
     if( XEmptyRegion( pClipRegion_ ) )
     {
@@ -646,7 +646,7 @@ void X11SalGraphics::SetLineColor()
     if( nPenColor_ != SALCOLOR_NONE )
     {
         nPenColor_      = SALCOLOR_NONE;
-        bPenGC_         = FALSE;
+        bPenGC_         = sal_False;
     }
 }
 
@@ -657,7 +657,7 @@ void X11SalGraphics::SetLineColor( SalColor nSalColor )
     {
         nPenColor_      = nSalColor;
         nPenPixel_      = GetPixel( nSalColor );
-        bPenGC_         = FALSE;
+        bPenGC_         = sal_False;
     }
 }
 
@@ -666,9 +666,9 @@ void X11SalGraphics::SetFillColor()
 {
     if( nBrushColor_ != SALCOLOR_NONE )
     {
-        bDitherBrush_   = FALSE;
+        bDitherBrush_   = sal_False;
         nBrushColor_    = SALCOLOR_NONE;
-        bBrushGC_       = FALSE;
+        bBrushGC_       = sal_False;
     }
 }
 
@@ -677,7 +677,7 @@ void X11SalGraphics::SetFillColor( SalColor nSalColor )
 {
     if( nBrushColor_ != nSalColor )
     {
-        bDitherBrush_   = FALSE;
+        bDitherBrush_   = sal_False;
         nBrushColor_    = nSalColor;
         nBrushPixel_    = GetPixel( nSalColor );
         if( TrueColor != GetColormap().GetVisual().GetClass()
@@ -699,7 +699,7 @@ void X11SalGraphics::SetFillColor( SalColor nSalColor )
             && nSalColor != MAKE_SALCOLOR( 0xFF, 0xFF, 0x00 ) // light brown
             && nSalColor != MAKE_SALCOLOR( 0xFF, 0xFF, 0xFF ) )
             bDitherBrush_ = GetDitherPixmap(nSalColor);
-        bBrushGC_       = FALSE;
+        bBrushGC_       = sal_False;
     }
 }
 
@@ -719,7 +719,7 @@ void X11SalGraphics::SetROPLineColor( SalROPColor nROPColor )
             break;
     }
     nPenColor_  = GetColormap().GetColor( nPenPixel_ );
-    bPenGC_     = FALSE;
+    bPenGC_     = sal_False;
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -737,9 +737,9 @@ void X11SalGraphics::SetROPFillColor( SalROPColor nROPColor )
             nBrushPixel_ = (Pixel)(1 << GetVisual().GetDepth()) - 1;
             break;
     }
-    bDitherBrush_   = FALSE;
+    bDitherBrush_   = sal_False;
     nBrushColor_    = GetColormap().GetColor( nBrushPixel_ );
-    bBrushGC_       = FALSE;
+    bBrushGC_       = sal_False;
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -748,15 +748,15 @@ void X11SalGraphics::SetXORMode( bool bSet, bool )
     if( !bXORMode_ == bSet )
     {
         bXORMode_   = bSet;
-        bPenGC_     = FALSE;
-        bFontGC_    = FALSE;
-        bBrushGC_   = FALSE;
-        bMonoGC_        = FALSE;
-        bCopyGC_        = FALSE;
-        bInvertGC_  = FALSE;
-        bInvert50GC_    = FALSE;
-        bStippleGC_ = FALSE;
-        bTrackingGC_    = FALSE;
+        bPenGC_     = sal_False;
+        bFontGC_    = sal_False;
+        bBrushGC_   = sal_False;
+        bMonoGC_        = sal_False;
+        bCopyGC_        = sal_False;
+        bInvertGC_  = sal_False;
+        bInvert50GC_    = sal_False;
+        bStippleGC_ = sal_False;
+        bTrackingGC_    = sal_False;
     }
 }
 
@@ -832,13 +832,13 @@ void X11SalGraphics::drawRect( long nX, long nY, long nDX, long nDY )
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalGraphics::drawPolyLine( ULONG nPoints, const SalPoint *pPtAry )
+void X11SalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry )
 {
     drawPolyLine( nPoints, pPtAry, false );
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalGraphics::drawPolyLine( ULONG nPoints, const SalPoint *pPtAry, bool bClose )
+void X11SalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry, bool bClose )
 {
     if( nPenColor_ != 0xFFFFFFFF )
     {
@@ -849,7 +849,7 @@ void X11SalGraphics::drawPolyLine( ULONG nPoints, const SalPoint *pPtAry, bool b
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalGraphics::drawPolygon( ULONG nPoints, const SalPoint* pPtAry )
+void X11SalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
 {
     if( nPoints == 0 )
         return;
@@ -922,7 +922,7 @@ void X11SalGraphics::drawPolyPolygon( sal_uInt32        nPoly,
 {
     if( nBrushColor_ != SALCOLOR_NONE )
     {
-        ULONG       i, n;
+        sal_uInt32      i, n;
         XLIB_Region pXRegA  = NULL;
 
         for( i = 0; i < nPoly; i++ ) {
@@ -949,7 +949,7 @@ void X11SalGraphics::drawPolyPolygon( sal_uInt32        nPoly,
             GC pGC = SelectBrush();
             SetClipRegion( pGC, pXRegA ); // ??? doppelt
             XDestroyRegion( pXRegA );
-            bBrushGC_ = FALSE;
+            bBrushGC_ = sal_False;
 
             XFillRectangle( GetXDisplay(),
                             GetDrawable(),
@@ -959,20 +959,20 @@ void X11SalGraphics::drawPolyPolygon( sal_uInt32        nPoly,
    }
 
    if( nPenColor_ != SALCOLOR_NONE )
-       for( ULONG i = 0; i < nPoly; i++ )
+       for( sal_uInt32 i = 0; i < nPoly; i++ )
            drawPolyLine( pPoints[i], pPtAry[i], true );
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-sal_Bool X11SalGraphics::drawPolyLineBezier( ULONG, const SalPoint*, const BYTE* )
+sal_Bool X11SalGraphics::drawPolyLineBezier( sal_uLong, const SalPoint*, const BYTE* )
 {
     return sal_False;
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-sal_Bool X11SalGraphics::drawPolygonBezier( ULONG, const SalPoint*, const BYTE* )
+sal_Bool X11SalGraphics::drawPolygonBezier( sal_uLong, const SalPoint*, const BYTE* )
 {
     return sal_False;
 }
@@ -987,7 +987,7 @@ sal_Bool X11SalGraphics::drawPolyPolygonBezier( sal_uInt32, const sal_uInt32*,
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-void X11SalGraphics::invert( ULONG nPoints,
+void X11SalGraphics::invert( sal_uLong nPoints,
                              const SalPoint* pPtAry,
                              SalInvert nFlags )
 {
@@ -1014,9 +1014,9 @@ void X11SalGraphics::invert( ULONG nPoints,
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-BOOL X11SalGraphics::drawEPS( long,long,long,long,void*,ULONG )
+BOOL X11SalGraphics::drawEPS( long,long,long,long,void*,sal_uLong )
 {
-    return FALSE;
+    return sal_False;
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -1087,22 +1087,22 @@ bool X11SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rOrigPoly
     // nothing to do for empty polypolygons
     const int nOrigPolyCount = rOrigPolyPoly.count();
     if( nOrigPolyCount <= 0 )
-        return TRUE;
+        return sal_True;
 
     // nothing to do if everything is transparent
     if( (nBrushColor_ == SALCOLOR_NONE)
     &&  (nPenColor_ == SALCOLOR_NONE) )
-        return TRUE;
+        return sal_True;
 
     // cannot handle pencolor!=brushcolor yet
     if( (nPenColor_ != SALCOLOR_NONE)
     &&  (nPenColor_ != nBrushColor_) )
-        return FALSE;
+        return sal_False;
 
     // TODO: remove the env-variable when no longer needed
     static const char* pRenderEnv = getenv( "SAL_DISABLE_RENDER_POLY" );
     if( pRenderEnv )
-        return FALSE;
+        return sal_False;
 
     // snap to raster if requested
     basegfx::B2DPolyPolygon aPolyPoly = rOrigPolyPoly;
diff --git a/vcl/unx/source/gdi/salgdi2.cxx b/vcl/unx/source/gdi/salgdi2.cxx
index 1cb2abbedf43..018f7514dfeb 100644
--- a/vcl/unx/source/gdi/salgdi2.cxx
+++ b/vcl/unx/source/gdi/salgdi2.cxx
@@ -150,7 +150,7 @@ inline GC X11SalGraphics::GetMonoGC( Pixmap hPixmap )
     if( !bMonoGC_ )
     {
         SetClipRegion( pMonoGC_ );
-        bMonoGC_ = TRUE;
+        bMonoGC_ = sal_True;
     }
 
     return pMonoGC_;
@@ -167,7 +167,7 @@ inline GC X11SalGraphics::GetCopyGC()
     if( !bCopyGC_ )
     {
         SetClipRegion( pCopyGC_ );
-        bCopyGC_ = TRUE;
+        bCopyGC_ = sal_True;
     }
     return pCopyGC_;
 }
@@ -185,7 +185,7 @@ GC X11SalGraphics::GetInvertGC()
     if( !bInvertGC_ )
     {
         SetClipRegion( pInvertGC_ );
-        bInvertGC_ = TRUE;
+        bInvertGC_ = sal_True;
     }
     return pInvertGC_;
 }
@@ -233,7 +233,7 @@ GC X11SalGraphics::GetInvert50GC()
     if( !bInvert50GC_ )
     {
         SetClipRegion( pInvert50GC_ );
-        bInvert50GC_ = TRUE;
+        bInvert50GC_ = sal_True;
     }
     return pInvert50GC_;
 }
@@ -251,7 +251,7 @@ inline GC X11SalGraphics::GetStippleGC()
     {
         XSetFunction( GetXDisplay(), pStippleGC_, bXORMode_ ? GXxor : GXcopy );
         SetClipRegion( pStippleGC_ );
-        bStippleGC_ = TRUE;
+        bStippleGC_ = sal_True;
     }
 
     return pStippleGC_;
@@ -608,7 +608,7 @@ void X11SalGraphics::copyBits( const SalTwoRect *pPosAry,
 void X11SalGraphics::copyArea ( long nDestX,    long nDestY,
                                 long nSrcX,     long nSrcY,
                                 long nSrcWidth, long nSrcHeight,
-                                USHORT )
+                                sal_uInt16 )
 {
     SalTwoRect aPosAry;
 
@@ -661,11 +661,11 @@ void X11SalGraphics::drawBitmap( const SalTwoRect* pPosAry,
     DBG_ASSERT( !bPrinter_, "Drawing of transparent bitmaps on printer devices is strictly forbidden" );
 
     // decide if alpha masking or transparency masking is needed
-    BitmapBuffer* pAlphaBuffer = const_cast<SalBitmap&>(rMaskBitmap).AcquireBuffer( TRUE );
+    BitmapBuffer* pAlphaBuffer = const_cast<SalBitmap&>(rMaskBitmap).AcquireBuffer( sal_True );
     if( pAlphaBuffer != NULL )
     {
         int nMaskFormat = pAlphaBuffer->mnFormat;
-        const_cast<SalBitmap&>(rMaskBitmap).ReleaseBuffer( pAlphaBuffer, TRUE );
+        const_cast<SalBitmap&>(rMaskBitmap).ReleaseBuffer( pAlphaBuffer, sal_True );
         if( nMaskFormat == BMP_FORMAT_8BIT_PAL )
             drawAlphaBitmap( *pPosAry, rSrcBitmap, rMaskBitmap );
     }
@@ -686,7 +686,7 @@ void X11SalGraphics::drawMaskedBitmap( const SalTwoRect* pPosAry,
     // figure work mode depth. If this is a VDev Drawable, use its
     // bitdepth to create pixmaps for, otherwise, XCopyArea will
     // refuse to work.
-    const USHORT    nDepth( m_pVDev ?
+    const sal_uInt16    nDepth( m_pVDev ?
                             m_pVDev->GetDepth() :
                             pSalDisp->GetVisual( m_nScreen ).GetDepth() );
     Pixmap          aFG( XCreatePixmap( pXDisp, aDrawable, pPosAry->mnDestWidth,
@@ -745,8 +745,8 @@ void X11SalGraphics::drawMaskedBitmap( const SalTwoRect* pPosAry,
         DBG_TESTTRANS( aBG );
 
         // #105055# Disable XOR temporarily
-        BOOL bOldXORMode( bXORMode_ );
-        bXORMode_ = FALSE;
+        sal_Bool bOldXORMode( bXORMode_ );
+        bXORMode_ = sal_False;
 
         // copy pixmap #2 (result) to background
         XCopyArea( pXDisp, aBG, aDrawable, GetCopyGC(),
@@ -834,7 +834,7 @@ bool X11SalGraphics::drawAlphaBitmap( const SalTwoRect& rTR,
 
     // TODO: use SalX11Bitmap functionality and caching for the Alpha Pixmap
     // problem is that they don't provide an 8bit Pixmap on a non-8bit display
-    BitmapBuffer* pAlphaBuffer = const_cast<SalBitmap&>(rAlphaBmp).AcquireBuffer( TRUE );
+    BitmapBuffer* pAlphaBuffer = const_cast<SalBitmap&>(rAlphaBmp).AcquireBuffer( sal_True );
 
     // an XImage needs its data top_down
     // TODO: avoid wrongly oriented images in upper layers!
@@ -879,7 +879,7 @@ bool X11SalGraphics::drawAlphaBitmap( const SalTwoRect& rTR,
     if( pAlphaBits != (char*)pAlphaBuffer->mpBits )
         delete[] pAlphaBits;
 
-    const_cast<SalBitmap&>(rAlphaBmp).ReleaseBuffer( pAlphaBuffer, TRUE );
+    const_cast<SalBitmap&>(rAlphaBmp).ReleaseBuffer( pAlphaBuffer, sal_True );
 
     XRenderPictureAttributes aAttr;
     aAttr.repeat = true;
@@ -1045,7 +1045,7 @@ SalBitmap *X11SalGraphics::getBitmap( long nX, long nY, long nDX, long nDY )
     }
 
     X11SalBitmap*   pSalBitmap = new X11SalBitmap;
-    USHORT          nBitCount = GetBitCount();
+    sal_uInt16          nBitCount = GetBitCount();
 
     if( &GetDisplay()->GetColormap( m_nScreen ) != &GetColormap() )
         nBitCount = 1;
diff --git a/vcl/unx/source/gdi/salgdi3.cxx b/vcl/unx/source/gdi/salgdi3.cxx
index d9f81c0f67d2..c719b33a1fbf 100644
--- a/vcl/unx/source/gdi/salgdi3.cxx
+++ b/vcl/unx/source/gdi/salgdi3.cxx
@@ -169,7 +169,7 @@ X11SalGraphics::GetFontGC()
     {
         XSetForeground( pDisplay, pFontGC_, nTextPixel_ );
         SetClipRegion( pFontGC_ );
-        bFontGC_ = TRUE;
+        bFontGC_ = sal_True;
     }
 
     return pFontGC_;
@@ -966,9 +966,9 @@ const ImplFontCharMap* X11SalGraphics::GetImplFontCharMap() const
 //
 // ----------------------------------------------------------------------------
 
-USHORT X11SalGraphics::SetFont( ImplFontSelectData *pEntry, int nFallbackLevel )
+sal_uInt16 X11SalGraphics::SetFont( ImplFontSelectData *pEntry, int nFallbackLevel )
 {
-    USHORT nRetVal = 0;
+    sal_uInt16 nRetVal = 0;
     if( !setFont( pEntry, nFallbackLevel ) )
         nRetVal |= SAL_SETFONT_BADFONT;
     if( bPrinter_ || (mpServerFont[ nFallbackLevel ] != NULL) )
@@ -985,7 +985,7 @@ X11SalGraphics::SetTextColor( SalColor nSalColor )
     {
         nTextColor_     = nSalColor;
         nTextPixel_     = GetPixel( nSalColor );
-        bFontGC_        = FALSE;
+        bFontGC_        = sal_False;
     }
 }
 
@@ -1218,15 +1218,15 @@ X11SalGraphics::GetFontMetric( ImplFontMetricData *pMetric, int nFallbackLevel )
 
 // ---------------------------------------------------------------------------
 
-ULONG
-X11SalGraphics::GetKernPairs( ULONG nPairs, ImplKernPairData *pKernPairs )
+sal_uLong
+X11SalGraphics::GetKernPairs( sal_uLong nPairs, ImplKernPairData *pKernPairs )
 {
     if( ! bPrinter_ )
     {
         if( mpServerFont[0] != NULL )
         {
             ImplKernPairData* pTmpKernPairs;
-            ULONG nGotPairs = mpServerFont[0]->GetKernPairs( &pTmpKernPairs );
+            sal_uLong nGotPairs = mpServerFont[0]->GetKernPairs( &pTmpKernPairs );
             for( unsigned int i = 0; i < nPairs && i < nGotPairs; ++i )
                 pKernPairs[ i ] = pTmpKernPairs[ i ];
             delete[] pTmpKernPairs;
@@ -1238,40 +1238,40 @@ X11SalGraphics::GetKernPairs( ULONG nPairs, ImplKernPairData *pKernPairs )
 
 // ---------------------------------------------------------------------------
 
-BOOL X11SalGraphics::GetGlyphBoundRect( long nGlyphIndex, Rectangle& rRect )
+sal_Bool X11SalGraphics::GetGlyphBoundRect( long nGlyphIndex, Rectangle& rRect )
 {
     int nLevel = nGlyphIndex >> GF_FONTSHIFT;
     if( nLevel >= MAX_FALLBACK )
-        return FALSE;
+        return sal_False;
 
     ServerFont* pSF = mpServerFont[ nLevel ];
     if( !pSF )
-        return FALSE;
+        return sal_False;
 
     nGlyphIndex &= ~GF_FONTMASK;
     const GlyphMetric& rGM = pSF->GetGlyphMetric( nGlyphIndex );
     rRect = Rectangle( rGM.GetOffset(), rGM.GetSize() );
-    return TRUE;
+    return sal_True;
 }
 
 // ---------------------------------------------------------------------------
 
-BOOL X11SalGraphics::GetGlyphOutline( long nGlyphIndex,
+sal_Bool X11SalGraphics::GetGlyphOutline( long nGlyphIndex,
     ::basegfx::B2DPolyPolygon& rPolyPoly )
 {
     int nLevel = nGlyphIndex >> GF_FONTSHIFT;
     if( nLevel >= MAX_FALLBACK )
-        return FALSE;
+        return sal_False;
 
     ServerFont* pSF = mpServerFont[ nLevel ];
     if( !pSF )
-        return FALSE;
+        return sal_False;
 
     nGlyphIndex &= ~GF_FONTMASK;
     if( pSF->GetGlyphOutline( nGlyphIndex, rPolyPoly ) )
-        return TRUE;
+        return sal_True;
 
-    return FALSE;
+    return sal_False;
 }
 
 //--------------------------------------------------------------------------
@@ -1332,7 +1332,7 @@ SystemFontData X11SalGraphics::GetSysFontData( int nFallbacklevel ) const
 
 //--------------------------------------------------------------------------
 
-BOOL X11SalGraphics::CreateFontSubset(
+sal_Bool X11SalGraphics::CreateFontSubset(
                                    const rtl::OUString& rToFile,
                                    const ImplFontData* pFont,
                                    sal_Int32* pGlyphIDs,
diff --git a/vcl/unx/source/gdi/salprnpsp.cxx b/vcl/unx/source/gdi/salprnpsp.cxx
index ece724d717cb..f3b50db6a9d9 100644
--- a/vcl/unx/source/gdi/salprnpsp.cxx
+++ b/vcl/unx/source/gdi/salprnpsp.cxx
@@ -213,7 +213,7 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
     if( rData.getStreamBuffer( pBuffer, nBytes ) )
     {
         pJobSetup->mnDriverDataLen = nBytes;
-        pJobSetup->mpDriverData = (BYTE*)pBuffer;
+        pJobSetup->mpDriverData = (sal_uInt8*)pBuffer;
     }
     else
     {
@@ -588,15 +588,15 @@ void PspSalInfoPrinter::ReleaseGraphics( SalGraphics* pGraphics )
 
 // -----------------------------------------------------------------------
 
-BOOL PspSalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pJobSetup )
+sal_Bool PspSalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pJobSetup )
 {
     if( ! pFrame || ! pJobSetup )
-        return FALSE;
+        return sal_False;
 
     getPaLib();
 
     if( ! pSetupFunction )
-        return FALSE;
+        return sal_False;
 
     PrinterInfoManager& rManager = PrinterInfoManager::get();
 
@@ -616,14 +616,14 @@ BOOL PspSalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pJobSetup )
         void* pBuffer = NULL;
         aInfo.getStreamBuffer( pBuffer, nBytes );
         pJobSetup->mnDriverDataLen  = nBytes;
-        pJobSetup->mpDriverData     = (BYTE*)pBuffer;
+        pJobSetup->mpDriverData     = (sal_uInt8*)pBuffer;
 
         // copy everything to job setup
         copyJobDataToJobSetup( pJobSetup, aInfo );
         JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, m_aJobData );
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
@@ -633,7 +633,7 @@ BOOL PspSalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pJobSetup )
 // data should be merged into the driver data
 // If pJobSetup->mpDriverData IS NULL, then the driver defaults
 // should be merged into the independent data
-BOOL PspSalInfoPrinter::SetPrinterData( ImplJobSetup* pJobSetup )
+sal_Bool PspSalInfoPrinter::SetPrinterData( ImplJobSetup* pJobSetup )
 {
     // set/clear backwards compatibility flag
     bool bStrictSO52Compatibility = false;
@@ -652,7 +652,7 @@ BOOL PspSalInfoPrinter::SetPrinterData( ImplJobSetup* pJobSetup )
 
     copyJobDataToJobSetup( pJobSetup, m_aJobData );
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -661,8 +661,8 @@ BOOL PspSalInfoPrinter::SetPrinterData( ImplJobSetup* pJobSetup )
 // and sets the new independ data in pJobSetup
 // Only the data must be changed, where the bit
 // in nGetDataFlags is set
-BOOL PspSalInfoPrinter::SetData(
-    ULONG nSetDataFlags,
+sal_Bool PspSalInfoPrinter::SetData(
+    sal_uLong nSetDataFlags,
     ImplJobSetup* pJobSetup )
 {
     JobData aData;
@@ -711,7 +711,7 @@ BOOL PspSalInfoPrinter::SetData(
             }
 
             if( ! ( pKey && pValue && aData.m_aContext.setValue( pKey, pValue, false ) == pValue ) )
-                return FALSE;
+                return sal_False;
         }
 
         // merge paperbin if necessary
@@ -771,10 +771,10 @@ BOOL PspSalInfoPrinter::SetData(
 
         m_aJobData = aData;
         copyJobDataToJobSetup( pJobSetup, aData );
-        return TRUE;
+        return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
@@ -823,7 +823,7 @@ void PspSalInfoPrinter::GetPageInfo(
 
 // -----------------------------------------------------------------------
 
-ULONG PspSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup )
+sal_uLong PspSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup )
 {
     if( ! pJobSetup )
         return 0;
@@ -837,7 +837,7 @@ ULONG PspSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup )
 
 // -----------------------------------------------------------------------
 
-String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, ULONG nPaperBin )
+String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_uLong nPaperBin )
 {
     JobData aData;
     JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aData );
@@ -846,7 +846,7 @@ String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, ULONG
     if( aData.m_pParser )
     {
         const PPDKey* pKey = aData.m_pParser ? aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "InputSlot" ) ) ): NULL;
-        if( ! pKey || nPaperBin >= (ULONG)pKey->countValues() )
+        if( ! pKey || nPaperBin >= (sal_uLong)pKey->countValues() )
             aRet = aData.m_pParser->getDefaultInputSlot();
         else
         {
@@ -861,7 +861,7 @@ String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, ULONG
 
 // -----------------------------------------------------------------------
 
-ULONG PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, USHORT nType )
+sal_uLong PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, sal_uInt16 nType )
 {
     switch( nType )
     {
@@ -955,11 +955,11 @@ static String getTmpName()
     return aSys;
 }
 
-BOOL PspSalPrinter::StartJob(
+sal_Bool PspSalPrinter::StartJob(
     const XubString* pFileName,
     const XubString& rJobName,
     const XubString& rAppName,
-    ULONG nCopies,
+    sal_uLong nCopies,
     bool bCollate,
     bool bDirect,
     ImplJobSetup* pJobSetup )
@@ -1035,16 +1035,16 @@ BOOL PspSalPrinter::StartJob(
     }
     m_aPrinterGfx.setStrictSO52Compatibility( bStrictSO52Compatibility );
 
-    return m_aPrintJob.StartJob( m_aTmpFile.Len() ? m_aTmpFile : m_aFileName, nMode, rJobName, rAppName, m_aJobData, &m_aPrinterGfx, bDirect ) ? TRUE : FALSE;
+    return m_aPrintJob.StartJob( m_aTmpFile.Len() ? m_aTmpFile : m_aFileName, nMode, rJobName, rAppName, m_aJobData, &m_aPrinterGfx, bDirect ) ? sal_True : sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL PspSalPrinter::EndJob()
+sal_Bool PspSalPrinter::EndJob()
 {
-    BOOL bSuccess = FALSE;
+    sal_Bool bSuccess = sal_False;
     if( m_bIsPDFWriterJob )
-        bSuccess = TRUE;
+        bSuccess = sal_True;
     else
     {
         bSuccess = m_aPrintJob.EndJob();
@@ -1072,16 +1072,16 @@ BOOL PspSalPrinter::EndJob()
 
 // -----------------------------------------------------------------------
 
-BOOL PspSalPrinter::AbortJob()
+sal_Bool PspSalPrinter::AbortJob()
 {
-    BOOL bAbort = m_aPrintJob.AbortJob() ? TRUE : FALSE;
+    sal_Bool bAbort = m_aPrintJob.AbortJob() ? sal_True : sal_False;
     vcl_sal::PrinterUpdate::jobEnded();
     return bAbort;
 }
 
 // -----------------------------------------------------------------------
 
-SalGraphics* PspSalPrinter::StartPage( ImplJobSetup* pJobSetup, BOOL )
+SalGraphics* PspSalPrinter::StartPage( ImplJobSetup* pJobSetup, sal_Bool )
 {
     JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, m_aJobData );
     m_pGraphics = new PspGraphics( &m_aJobData, &m_aPrinterGfx, m_bFax ? &m_aFaxNr : NULL, m_bSwallowFaxNo, m_pInfoPrinter  );
@@ -1102,16 +1102,16 @@ SalGraphics* PspSalPrinter::StartPage( ImplJobSetup* pJobSetup, BOOL )
 
 // -----------------------------------------------------------------------
 
-BOOL PspSalPrinter::EndPage()
+sal_Bool PspSalPrinter::EndPage()
 {
     sal_Bool bResult = m_aPrintJob.EndPage();
     m_aPrinterGfx.Clear();
-    return bResult ? TRUE : FALSE;
+    return bResult ? sal_True : sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-ULONG PspSalPrinter::GetErrorCode()
+sal_uLong PspSalPrinter::GetErrorCode()
 {
     return 0;
 }
@@ -1121,10 +1121,10 @@ ULONG PspSalPrinter::GetErrorCode()
 struct PDFNewJobParameters
 {
     Size        maPageSize;
-    USHORT      mnPaperBin;
+    sal_uInt16      mnPaperBin;
 
     PDFNewJobParameters( const Size& i_rSize = Size(),
-                         USHORT i_nPaperBin = 0xffff )
+                         sal_uInt16 i_nPaperBin = 0xffff )
     : maPageSize( i_rSize ), mnPaperBin( i_nPaperBin ) {}
 
     bool operator!=(const PDFNewJobParameters& rComp ) const
@@ -1152,7 +1152,7 @@ struct PDFPrintFile
     , maParameters( i_rNewParameters ) {}
 };
 
-BOOL PspSalPrinter::StartJob( const String* i_pFileName, const String& i_rJobName, const String& i_rAppName,
+sal_Bool PspSalPrinter::StartJob( const String* i_pFileName, const String& i_rJobName, const String& i_rAppName,
                               ImplJobSetup* i_pSetupData, vcl::PrinterController& i_rController )
 {
     OSL_TRACE( "StartJob with controller: pFilename = %s", i_pFileName ? rtl::OUStringToOString( *i_pFileName, RTL_TEXTENCODING_UTF8 ).getStr() : "<nil>" );
@@ -1376,7 +1376,7 @@ BOOL PspSalPrinter::StartJob( const String* i_pFileName, const String& i_rJobNam
         }
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 
diff --git a/vcl/unx/source/gdi/salvd.cxx b/vcl/unx/source/gdi/salvd.cxx
index f242fffae715..675deef90ffe 100644
--- a/vcl/unx/source/gdi/salvd.cxx
+++ b/vcl/unx/source/gdi/salvd.cxx
@@ -44,7 +44,7 @@
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 SalVirtualDevice* X11SalInstance::CreateVirtualDevice( SalGraphics* pGraphics,
                                                        long nDX, long nDY,
-                                                       USHORT nBitCount, const SystemGraphicsData *pData )
+                                                       sal_uInt16 nBitCount, const SystemGraphicsData *pData )
 {
     X11SalVirtualDevice *pVDev = new X11SalVirtualDevice();
     if( !nBitCount && pGraphics )
@@ -125,14 +125,14 @@ void X11SalGraphics::Init( X11SalVirtualDevice *pDevice, SalColormap* pColormap,
     m_pFrame     = NULL;
 
     bWindow_     = pDisplay->IsDisplay();
-    bVirDev_     = TRUE;
+    bVirDev_     = sal_True;
 }
 
 // -=-= SalVirDevData / SalVirtualDevice -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-BOOL X11SalVirtualDevice::Init( SalDisplay *pDisplay,
+sal_Bool X11SalVirtualDevice::Init( SalDisplay *pDisplay,
                                 long nDX, long nDY,
-                                USHORT nBitCount,
+                                sal_uInt16 nBitCount,
                                 int nScreen,
                                 Pixmap hDrawable,
                                 void* pRenderFormatVoid )
@@ -170,12 +170,12 @@ BOOL X11SalVirtualDevice::Init( SalDisplay *pDisplay,
     else
     {
         hDrawable_ = hDrawable;
-        bExternPixmap_ = TRUE;
+        bExternPixmap_ = sal_True;
     }
 
     pGraphics_->Init( this, pColormap, bDeleteColormap );
 
-    return hDrawable_ != None ? TRUE : FALSE;
+    return hDrawable_ != None ? sal_True : sal_False;
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -187,8 +187,8 @@ X11SalVirtualDevice::X11SalVirtualDevice()
     nDX_                    = 0;
     nDY_                    = 0;
     nDepth_                 = 0;
-    bGraphics_              = FALSE;
-    bExternPixmap_          = FALSE;
+    bGraphics_              = sal_False;
+    bExternPixmap_          = sal_False;
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -208,18 +208,18 @@ SalGraphics* X11SalVirtualDevice::GetGraphics()
         return NULL;
 
     if( pGraphics_ )
-        bGraphics_ = TRUE;
+        bGraphics_ = sal_True;
 
     return pGraphics_;
 }
 
 void X11SalVirtualDevice::ReleaseGraphics( SalGraphics* )
-{ bGraphics_ = FALSE; }
+{ bGraphics_ = sal_False; }
 
-BOOL X11SalVirtualDevice::SetSize( long nDX, long nDY )
+sal_Bool X11SalVirtualDevice::SetSize( long nDX, long nDY )
 {
     if( bExternPixmap_ )
-        return FALSE;
+        return sal_False;
 
     // #144688#
     // the X protocol request CreatePixmap puts an upper bound
@@ -229,7 +229,7 @@ BOOL X11SalVirtualDevice::SetSize( long nDX, long nDY )
     // 16 bit truncation here without noticing.
     if( nDX < 0 || nDX > 65535 ||
         nDY < 0 || nDY > 65535 )
-        return FALSE;
+        return sal_False;
 
     if( !nDX ) nDX = 1;
     if( !nDY ) nDY = 1;
@@ -248,7 +248,7 @@ BOOL X11SalVirtualDevice::SetSize( long nDX, long nDY )
             nDX_ = 1;
             nDY_ = 1;
         }
-        return FALSE;
+        return sal_False;
     }
 
     if( GetDrawable() )
@@ -261,7 +261,7 @@ BOOL X11SalVirtualDevice::SetSize( long nDX, long nDY )
     if( pGraphics_ )
         InitGraphics( this );
 
-    return TRUE;
+    return sal_True;
 }
 
 void X11SalVirtualDevice::GetSize( long& rWidth, long& rHeight )
diff --git a/vcl/unx/source/printer/jobdata.cxx b/vcl/unx/source/printer/jobdata.cxx
index d4211eae31df..811f93bcb826 100644
--- a/vcl/unx/source/printer/jobdata.cxx
+++ b/vcl/unx/source/printer/jobdata.cxx
@@ -167,7 +167,7 @@ bool JobData::getStreamBuffer( void*& pData, int& bytes )
 
     // now append the PPDContext stream buffer
     aStream.WriteLine( "PPDContexData" );
-    ULONG nBytes;
+    sal_uLong nBytes;
     void* pContextBuffer = m_aContext.getStreamableBuffer( nBytes );
     if( nBytes )
         aStream.Write( pContextBuffer, nBytes );
diff --git a/vcl/unx/source/printer/ppdparser.cxx b/vcl/unx/source/printer/ppdparser.cxx
index 587e58be5bc7..9a85d02db894 100644
--- a/vcl/unx/source/printer/ppdparser.cxx
+++ b/vcl/unx/source/printer/ppdparser.cxx
@@ -311,7 +311,7 @@ void PPDDecompressStream::Open( const rtl::OUString& i_rFile )
     mpFileStream->Seek( 0 );
 
     // check for compress'ed or gzip'ed file
-    ULONG nCompressMethod = 0;
+    sal_uLong nCompressMethod = 0;
     if( aLine.Len() > 1 && static_cast<unsigned char>(aLine.GetChar( 0 )) == 0x1f )
     {
         if( static_cast<unsigned char>(aLine.GetChar( 1 )) == 0x8b ) // check for gzip
@@ -1110,7 +1110,7 @@ void PPDParser::parse( ::std::list< ByteString >& rLines )
             m_pTranslator->insertValue( aUniKey, aOption, aValue, aValueTranslation, aTransLocale );
 
         // eventually update query and remove from option list
-        if( bQuery && pKey->m_bQueryValue == FALSE )
+        if( bQuery && pKey->m_bQueryValue == sal_False )
         {
             pKey->m_aQueryValue = *pValue;
             pKey->m_bQueryValue = true;
@@ -1125,7 +1125,7 @@ void PPDParser::parse( ::std::list< ByteString >& rLines )
         if( aLine.CompareTo( "*Default", 8 ) == COMPARE_EQUAL )
         {
             String aKey( aLine.Copy( 8 ), RTL_TEXTENCODING_MS_1252 );
-            USHORT nPos = aKey.Search( ':' );
+            sal_uInt16 nPos = aKey.Search( ':' );
             if( nPos != STRING_NOTFOUND )
             {
                 aKey.Erase( nPos );
@@ -1417,7 +1417,7 @@ String PPDParser::getSlot( int nSlot ) const
     if( nSlot > 0 && nSlot < m_pInputSlots->countValues() )
         return m_pInputSlots->getValue( nSlot )->m_aOption;
     else if( m_pInputSlots->countValues() > 0 )
-        return m_pInputSlots->getValue( (ULONG)0 )->m_aOption;
+        return m_pInputSlots->getValue( (sal_uLong)0 )->m_aOption;
 
     return String();
 }
@@ -1430,7 +1430,7 @@ String PPDParser::getSlotCommand( int nSlot ) const
     if( nSlot > 0 && nSlot < m_pInputSlots->countValues() )
         return m_pInputSlots->getValue( nSlot )->m_aValue;
     else if( m_pInputSlots->countValues() > 0 )
-        return m_pInputSlots->getValue( (ULONG)0 )->m_aValue;
+        return m_pInputSlots->getValue( (sal_uLong)0 )->m_aValue;
 
     return String();
 }
@@ -1457,7 +1457,7 @@ String PPDParser::getPaperDimension( int nPaperDimension ) const
     if( nPaperDimension > 0 && nPaperDimension < m_pPaperDimensions->countValues() )
         return m_pPaperDimensions->getValue( nPaperDimension )->m_aOption;
     else if( m_pPaperDimensions->countValues() > 0 )
-        return m_pPaperDimensions->getValue( (ULONG)0 )->m_aOption;
+        return m_pPaperDimensions->getValue( (sal_uLong)0 )->m_aOption;
 
     return String();
 }
@@ -1470,7 +1470,7 @@ String PPDParser::getPaperDimensionCommand( int nPaperDimension ) const
     if( nPaperDimension > 0 && nPaperDimension < m_pPaperDimensions->countValues() )
         return m_pPaperDimensions->getValue( nPaperDimension )->m_aValue;
     else if( m_pPaperDimensions->countValues() > 0 )
-        return m_pPaperDimensions->getValue( (ULONG)0 )->m_aValue;
+        return m_pPaperDimensions->getValue( (sal_uLong)0 )->m_aValue;
 
     return String();
 }
@@ -1578,7 +1578,7 @@ String PPDParser::getDuplex( int nDuplex ) const
     if( nDuplex > 0 && nDuplex < m_pDuplexTypes->countValues() )
         return m_pDuplexTypes->getValue( nDuplex )->m_aOption;
     else if( m_pDuplexTypes->countValues() > 0 )
-        return m_pDuplexTypes->getValue( (ULONG)0 )->m_aOption;
+        return m_pDuplexTypes->getValue( (sal_uLong)0 )->m_aOption;
 
     return String();
 }
@@ -1591,7 +1591,7 @@ String PPDParser::getDuplexCommand( int nDuplex ) const
     if( nDuplex > 0 && nDuplex < m_pDuplexTypes->countValues() )
         return m_pDuplexTypes->getValue( nDuplex )->m_aValue;
     else if( m_pDuplexTypes->countValues() > 0 )
-        return m_pDuplexTypes->getValue( (ULONG)0 )->m_aValue;
+        return m_pDuplexTypes->getValue( (sal_uLong)0 )->m_aValue;
 
     return String();
 }
@@ -2033,7 +2033,7 @@ void PPDContext::getUnconstrainedValues( const PPDKey* pKey, ::std::list< const
 
 // -------------------------------------------------------------------
 
-void* PPDContext::getStreamableBuffer( ULONG& rBytes ) const
+void* PPDContext::getStreamableBuffer( sal_uLong& rBytes ) const
 {
     rBytes = 0;
     if( ! m_aCurrentValues.size() )
@@ -2079,7 +2079,7 @@ void* PPDContext::getStreamableBuffer( ULONG& rBytes ) const
 
 // -------------------------------------------------------------------
 
-void PPDContext::rebuildFromStreamBuffer( void* pBuffer, ULONG nBytes )
+void PPDContext::rebuildFromStreamBuffer( void* pBuffer, sal_uLong nBytes )
 {
     if( ! m_pParser )
         return;
diff --git a/vcl/unx/source/printer/printerinfomanager.cxx b/vcl/unx/source/printer/printerinfomanager.cxx
index af189b1b01b5..421ce74b98d8 100644
--- a/vcl/unx/source/printer/printerinfomanager.cxx
+++ b/vcl/unx/source/printer/printerinfomanager.cxx
@@ -328,7 +328,7 @@ void PrinterInfoManager::initialize()
                         m_aGlobalDefaults.m_aContext.
                         setValue( pKey,
                         aValue.Equals( "*nil" ) ? NULL : pKey->getValue( String( aValue, RTL_TEXTENCODING_ISO_8859_1 ) ),
-                        TRUE );
+                        sal_True );
                     }
                 }
                 else if( aKey.Len() > 10 && aKey.CompareTo("SubstFont_", 10 ) == COMPARE_EQUAL )
@@ -533,7 +533,7 @@ void PrinterInfoManager::initialize()
                             aPrinter.m_aInfo.m_aContext.
                             setValue( pKey,
                             aValue.Equals( "*nil" ) ? NULL : pKey->getValue( String( aValue, RTL_TEXTENCODING_ISO_8859_1 ) ),
-                            TRUE );
+                            sal_True );
                         }
                     }
                     else if( aKey.Len() > 10 && aKey.CompareTo("SubstFont_", 10 ) == COMPARE_EQUAL )
diff --git a/vcl/unx/source/printergfx/common_gfx.cxx b/vcl/unx/source/printergfx/common_gfx.cxx
index 6bb31acfcbbe..fa032c46a74b 100644
--- a/vcl/unx/source/printergfx/common_gfx.cxx
+++ b/vcl/unx/source/printergfx/common_gfx.cxx
@@ -527,9 +527,9 @@ PrinterGfx::DrawPolyPolygon (sal_uInt32 nPoly, const sal_uInt32* pSizes, const P
  */
 
 void
-PrinterGfx::DrawPolyLineBezier (sal_uInt32 nPoints, const Point* pPath, const BYTE* pFlgAry)
+PrinterGfx::DrawPolyLineBezier (sal_uInt32 nPoints, const Point* pPath, const sal_uInt8* pFlgAry)
 {
-    const sal_uInt32 nBezString = 1024;
+    const sal_uInt32 nBezString= 1024;
     sal_Char pString[nBezString];
 
     if ( nPoints > 1 && maLineColor.Is() && pPath )
@@ -578,7 +578,7 @@ PrinterGfx::DrawPolyLineBezier (sal_uInt32 nPoints, const Point* pPath, const BY
 }
 
 void
-PrinterGfx::DrawPolygonBezier (sal_uInt32 nPoints, const Point* pPath, const BYTE* pFlgAry)
+PrinterGfx::DrawPolygonBezier (sal_uInt32 nPoints, const Point* pPath, const sal_uInt8* pFlgAry)
 {
     const sal_uInt32 nBezString = 1024;
     sal_Char pString[nBezString];
@@ -634,7 +634,7 @@ PrinterGfx::DrawPolygonBezier (sal_uInt32 nPoints, const Point* pPath, const BYT
 }
 
 void
-PrinterGfx::DrawPolyPolygonBezier (sal_uInt32 nPoly, const sal_uInt32 * pPoints, const Point* const * pPtAry, const BYTE* const* pFlgAry)
+PrinterGfx::DrawPolyPolygonBezier (sal_uInt32 nPoly, const sal_uInt32 * pPoints, const Point* const * pPtAry, const sal_uInt8* const* pFlgAry)
 {
     const sal_uInt32 nBezString = 1024;
     sal_Char pString[nBezString];
diff --git a/vcl/unx/source/printergfx/printerjob.cxx b/vcl/unx/source/printergfx/printerjob.cxx
index af2cf14b1a0c..947eb290ec60 100644
--- a/vcl/unx/source/printergfx/printerjob.cxx
+++ b/vcl/unx/source/printergfx/printerjob.cxx
@@ -410,7 +410,7 @@ PrinterJob::StartJob (
     rtl::OUString aFilterWS;
 
     // Creator (this application)
-    aFilterWS = WhitespaceToSpace( rAppName, FALSE );
+    aFilterWS = WhitespaceToSpace( rAppName, sal_False );
     WritePS (mpJobHeader, "%%Creator: (");
     WritePS (mpJobHeader, aFilterWS);
     WritePS (mpJobHeader, ")\n");
@@ -448,14 +448,14 @@ PrinterJob::StartJob (
     * use the filename, if it contains only ascii
     * else omit %%Title
     */
-    aFilterWS = WhitespaceToSpace( rJobName, FALSE );
+    aFilterWS = WhitespaceToSpace( rJobName, sal_False );
     rtl::OUString aTitle( aFilterWS );
     if( ! isAscii( aTitle ) )
     {
         sal_Int32 nIndex = 0;
         while( nIndex != -1 )
             aTitle = rFileName.getToken( 0, '/', nIndex );
-        aTitle = WhitespaceToSpace( aTitle, FALSE );
+        aTitle = WhitespaceToSpace( aTitle, sal_False );
         if( ! isAscii( aTitle ) )
             aTitle = rtl::OUString();
     }
diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx
index 11c20aa40f5a..5ad3a9d94375 100644
--- a/vcl/unx/source/window/salframe.cxx
+++ b/vcl/unx/source/window/salframe.cxx
@@ -209,7 +209,7 @@ void X11SalFrame::askForXEmbedFocus( sal_Int32 i_nTimeCode )
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-void X11SalFrame::Init( ULONG nSalFrameStyle, int nScreen, SystemParentData* pParentData, bool bUseGeometry )
+void X11SalFrame::Init( sal_uLong nSalFrameStyle, int nScreen, SystemParentData* pParentData, bool bUseGeometry )
 {
     if( nScreen < 0 || nScreen >= GetDisplay()->GetScreenCount() )
         nScreen = GetDisplay()->GetDefaultScreenNumber();
@@ -482,8 +482,8 @@ void X11SalFrame::Init( ULONG nSalFrameStyle, int nScreen, SystemParentData* pPa
     }
 
     nShowState_                 = SHOWSTATE_UNKNOWN;
-    bViewable_                  = TRUE;
-    bMapped_                    = FALSE;
+    bViewable_                  = sal_True;
+    bMapped_                    = sal_False;
     nVisibility_                = VisibilityFullyObscured;
     mhWindow = XCreateWindow( GetXDisplay(),
                               aFrameParent,
@@ -645,7 +645,7 @@ void X11SalFrame::Init( ULONG nSalFrameStyle, int nScreen, SystemParentData* pPa
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-X11SalFrame::X11SalFrame( SalFrame *pParent, ULONG nSalFrameStyle, SystemParentData* pSystemParent )
+X11SalFrame::X11SalFrame( SalFrame *pParent, sal_uLong nSalFrameStyle, SystemParentData* pSystemParent )
 {
     X11SalData* pSalData = GetX11SalData();
 
@@ -686,16 +686,16 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, ULONG nSalFrameStyle, SystemParentD
     nHeight_                    = 0;
     nStyle_                     = 0;
     mnExtStyle                  = 0;
-    bAlwaysOnTop_               = FALSE;
+    bAlwaysOnTop_               = sal_False;
 
-    // set bViewable_ to TRUE: hack GetClientSize to report something
+    // set bViewable_ to sal_True: hack GetClientSize to report something
     // different to 0/0 before first map
-    bViewable_                  = TRUE;
-    bMapped_                    = FALSE;
-    bDefaultPosition_           = TRUE;
+    bViewable_                  = sal_True;
+    bMapped_                    = sal_False;
+    bDefaultPosition_           = sal_True;
     nVisibility_                = VisibilityFullyObscured;
     m_nWorkArea                 = 0;
-    mbInShow                    = FALSE;
+    mbInShow                    = sal_False;
     m_bXEmbed                   = false;
 
     nScreenSaversTimeout_       = 0;
@@ -790,10 +790,10 @@ X11SalFrame::~X11SalFrame()
         XSelectInput( GetXDisplay(), GetShellWindow(), 0 );
     XSelectInput( GetXDisplay(), GetWindow(), 0 );
 
-    ShowFullScreen( FALSE, 0 );
+    ShowFullScreen( sal_False, 0 );
 
     if( bMapped_ )
-        Show( FALSE );
+        Show( sal_False );
 
     if( mpInputContext )
     {
@@ -956,14 +956,14 @@ void X11SalFrame::updateGraphics( bool bClear )
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-void X11SalFrame::Enable( BOOL /*bEnable*/ )
+void X11SalFrame::Enable( sal_Bool /*bEnable*/ )
 {
     // NYI: enable/disable frame
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-void X11SalFrame::SetIcon( USHORT nIcon )
+void X11SalFrame::SetIcon( sal_uInt16 nIcon )
 {
     if ( ! IsChildWindow() )
     {
@@ -1065,7 +1065,7 @@ void X11SalFrame::SetIcon( USHORT nIcon )
         }
         pHints = &Hints;
 
-        BOOL bOk = SelectAppIconPixmap( GetDisplay(), m_nScreen,
+        sal_Bool bOk = SelectAppIconPixmap( GetDisplay(), m_nScreen,
                                         nIcon, iconSize,
                                         pHints->icon_pixmap, pHints->icon_mask );
         if ( !bOk )
@@ -1138,7 +1138,7 @@ void X11SalFrame::SetMinClientSize( long nWidth, long nHeight )
 
 // Show + Pos (x,y,z) + Size (width,height)
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalFrame::Show( BOOL bVisible, BOOL bNoActivate )
+void X11SalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate )
 {
     if( ( bVisible && bMapped_ )
         || ( !bVisible && !bMapped_ ) )
@@ -1158,7 +1158,7 @@ void X11SalFrame::Show( BOOL bVisible, BOOL bNoActivate )
     {
         SessionManagerClient::open(); // will simply return after the first time
 
-        mbInShow = TRUE;
+        mbInShow = sal_True;
         if( ! (nStyle_ & SAL_FRAME_STYLE_INTRO) )
         {
             // hide all INTRO frames
@@ -1170,12 +1170,12 @@ void X11SalFrame::Show( BOOL bVisible, BOOL bNoActivate )
                 if( pFrame->nStyle_ & SAL_FRAME_STYLE_INTRO )
                 {
                     if( pFrame->bMapped_ )
-                        const_cast<X11SalFrame*>(pFrame)->Show( FALSE );
+                        const_cast<X11SalFrame*>(pFrame)->Show( sal_False );
                 }
             }
         }
 
-        // update NET_WM_STATE which may have been deleted due to earlier Show(FALSE)
+        // update NET_WM_STATE which may have been deleted due to earlier Show(sal_False)
         if( nShowState_ == SHOWSTATE_HIDDEN )
             GetDisplay()->getWMAdaptor()->frameIsMapping( this );
 
@@ -1185,7 +1185,7 @@ void X11SalFrame::Show( BOOL bVisible, BOOL bNoActivate )
          *  with the basic dialogue editor,
          *  which shows a frame and instantly hides it again. After that the
          *  editor window is shown and the WM takes this as an opportunity
-         *  to show our hidden transient frame also. So Show( FALSE ) must
+         *  to show our hidden transient frame also. So Show( sal_False ) must
          *  withdraw the frame AND delete the WM_TRANSIENT_FOR property.
          *  In case the frame is shown again, the transient hint must be restored here.
          */
@@ -1319,7 +1319,7 @@ void X11SalFrame::Show( BOOL bVisible, BOOL bNoActivate )
          *  #98107# plugged windows don't necessarily get the
          *  focus on show because the parent may already be mapped
          *  and have the focus. So try to set the focus
-         *  to the child on Show(TRUE)
+         *  to the child on Show(sal_True)
          */
         if( (nStyle_ & SAL_FRAME_STYLE_PLUG) && ! m_bXEmbed )
             XSetInputFocus( GetXDisplay(),
@@ -1367,7 +1367,7 @@ void X11SalFrame::Show( BOOL bVisible, BOOL bNoActivate )
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalFrame::ToTop( USHORT nFlags )
+void X11SalFrame::ToTop( sal_uInt16 nFlags )
 {
     if( ( nFlags & SAL_FRAME_TOTOP_RESTOREWHENMIN )
         && ! ( nStyle_ & SAL_FRAME_STYLE_FLOAT )
@@ -1585,7 +1585,7 @@ void X11SalFrame::updateScreenNumber()
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, USHORT nFlags )
+void X11SalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags )
 {
     if( nStyle_ & SAL_FRAME_STYLE_PLUG )
         return;
@@ -1631,7 +1631,7 @@ void X11SalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, USHOR
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalFrame::SetAlwaysOnTop( BOOL bOnTop )
+void X11SalFrame::SetAlwaysOnTop( sal_Bool bOnTop )
 {
     if( ! IsOverrideRedirect() )
     {
@@ -1812,7 +1812,7 @@ void X11SalFrame::SetWindowState( const SalFrameState *pState )
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-BOOL X11SalFrame::GetWindowState( SalFrameState* pState )
+sal_Bool X11SalFrame::GetWindowState( SalFrameState* pState )
 {
     if( SHOWSTATE_MINIMIZED == nShowState_ )
         pState->mnState = SAL_FRAMESTATE_MINIMIZED;
@@ -1851,7 +1851,7 @@ BOOL X11SalFrame::GetWindowState( SalFrameState* pState )
         pState->mnMask |= _FRAMESTATE_MASK_MAXIMIZED_GEOMETRY;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 // ----------------------------------------------------------------------------
@@ -2170,29 +2170,29 @@ void X11SalFrame::SetScreenNumber( unsigned int nNewScreen )
         Rectangle aNewScreenRect( GetDisplay()->GetXineramaScreens()[nNewScreen] );
         bool bVisible = bMapped_;
         if( bVisible )
-            Show( FALSE );
+            Show( sal_False );
         maGeometry.nX = aNewScreenRect.Left() + (maGeometry.nX - aOldScreenRect.Left());
         maGeometry.nY = aNewScreenRect.Top() + (maGeometry.nY - aOldScreenRect.Top());
         createNewWindow( None, m_nScreen );
         if( bVisible )
-            Show( TRUE );
+            Show( sal_True );
         maGeometry.nScreenNumber = nNewScreen;
     }
     else if( sal_Int32(nNewScreen) < GetDisplay()->GetScreenCount() )
     {
         bool bVisible = bMapped_;
         if( bVisible )
-            Show( FALSE );
+            Show( sal_False );
         createNewWindow( None, nNewScreen );
         if( bVisible )
-            Show( TRUE );
+            Show( sal_True );
         maGeometry.nScreenNumber = nNewScreen;
     }
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-void X11SalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nScreen )
+void X11SalFrame::ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nScreen )
 {
     if( GetDisplay()->IsXinerama() && GetDisplay()->GetXineramaScreens().size() > 1 )
     {
@@ -2210,7 +2210,7 @@ void X11SalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nScreen )
             nStyle_ |= SAL_FRAME_STYLE_PARTIAL_FULLSCREEN;
             bool bVisible = bMapped_;
             if( bVisible )
-                Show( FALSE );
+                Show( sal_False );
             maGeometry.nX = aRect.Left();
             maGeometry.nY = aRect.Top();
             maGeometry.nWidth = aRect.GetWidth();
@@ -2223,7 +2223,7 @@ void X11SalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nScreen )
             else
                 GetDisplay()->getWMAdaptor()->showFullScreen( this, true );
             if( bVisible )
-                Show(TRUE);
+                Show(sal_True);
 
         }
         else
@@ -2234,14 +2234,14 @@ void X11SalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nScreen )
             Rectangle aRect = maRestorePosSize;
             maRestorePosSize = Rectangle();
             if( bVisible )
-                Show( FALSE );
+                Show( sal_False );
             createNewWindow( None, m_nScreen );
             if( !aRect.IsEmpty() )
                 SetPosSize( aRect.Left(), aRect.Top(), aRect.GetWidth(), aRect.GetHeight(),
                             SAL_FRAME_POSSIZE_X | SAL_FRAME_POSSIZE_Y |
                             SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT );
             if( bVisible )
-                Show( TRUE );
+                Show( sal_True );
         }
     }
     else
@@ -2254,12 +2254,12 @@ void X11SalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nScreen )
             if( mbFullScreen )
                 pDisplay_->getWMAdaptor()->showFullScreen( this, false );
             if( bVisible )
-                Show( FALSE );
+                Show( sal_False );
             createNewWindow( None, nScreen );
             if( mbFullScreen )
                 pDisplay_->getWMAdaptor()->showFullScreen( this, true );
             if( bVisible )
-                Show( TRUE );
+                Show( sal_True );
         }
         if( mbFullScreen == (bool)bFullScreen )
             return;
@@ -2344,7 +2344,7 @@ MessageToXAutoLock( Display *p_display, int n_message )
 }
 
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalFrame::StartPresentation( BOOL bStart )
+void X11SalFrame::StartPresentation( sal_Bool bStart )
 {
     I18NStatus::get().show( !bStart, I18NStatus::presentation );
     if ( bStart )
@@ -2362,7 +2362,7 @@ void X11SalFrame::StartPresentation( BOOL bStart )
     static bool DPMSExtensionAvailable =
 #ifndef SOLARIS
         (DPMSQueryExtension(GetXDisplay(), &dummy, &dummy) != 0);
-    static XLIB_BOOL DPMSEnabled = false;
+    static sal_Bool DPMSEnabled = false;
 #else
         false;
     bool DPMSEnabled = false;
@@ -2541,10 +2541,10 @@ X11SalFrame::HandleExtTextEvent (XClientMessageEvent *pEvent)
 
 // PostEvent
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-BOOL X11SalFrame::PostEvent( void *pData )
+sal_Bool X11SalFrame::PostEvent( void *pData )
 {
     GetDisplay()->SendInternalEvent( this, pData );
-    return TRUE;
+    return sal_True;
 }
 
 // Title
@@ -2616,7 +2616,7 @@ void X11SalFrame::SetInputContext( SalInputContext* pContext )
 
 // -----------------------------------------------------------------------
 
-void X11SalFrame::EndExtTextInput( USHORT nFlags )
+void X11SalFrame::EndExtTextInput( sal_uInt16 nFlags )
 {
     if (mpInputContext != NULL)
           mpInputContext->EndExtTextInput( nFlags );
@@ -2624,20 +2624,20 @@ void X11SalFrame::EndExtTextInput( USHORT nFlags )
 
 // -----------------------------------------------------------------------
 
-XubString X11SalFrame::GetKeyName( USHORT nKeyCode )
+XubString X11SalFrame::GetKeyName( sal_uInt16 nKeyCode )
 {
     return GetDisplay()->GetKeyName( nKeyCode );
 }
 
-XubString X11SalFrame::GetSymbolKeyName( const XubString&, USHORT nKeyCode )
+XubString X11SalFrame::GetSymbolKeyName( const XubString&, sal_uInt16 nKeyCode )
 {
   return GetKeyName( nKeyCode );
 }
 
-BOOL X11SalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , KeyCode& )
+sal_Bool X11SalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , KeyCode& )
 {
     // not supported yet
-    return FALSE;
+    return sal_False;
 }
 
 LanguageType X11SalFrame::GetInputLanguage()
@@ -2665,7 +2665,7 @@ void X11SalFrame::UpdateSettings( AllSettings& rSettings )
         pIntegrator->GetSystemLook( rSettings );
 }
 
-void X11SalFrame::CaptureMouse( BOOL bCapture )
+void X11SalFrame::CaptureMouse( sal_Bool bCapture )
 {
     nCaptured_ = pDisplay_->CaptureMouse( bCapture ? this : NULL );
 }
@@ -2696,7 +2696,7 @@ void X11SalFrame::createNewWindow( XLIB_Window aNewParent, int nScreen )
 {
     bool bWasVisible = bMapped_;
     if( bWasVisible )
-        Show( FALSE );
+        Show( sal_False );
 
     if( nScreen < 0 || nScreen >= GetDisplay()->GetScreenCount() )
         nScreen = m_nScreen;
@@ -2765,7 +2765,7 @@ void X11SalFrame::createNewWindow( XLIB_Window aNewParent, int nScreen )
     }
 
     if( bWasVisible )
-        Show( TRUE );
+        Show( sal_True );
 
     std::list< X11SalFrame* > aChildren = maChildren;
     for( std::list< X11SalFrame* >::iterator it = aChildren.begin(); it != aChildren.end(); ++it )
@@ -2801,9 +2801,9 @@ void X11SalFrame::Beep( SoundType eSoundType ) // not fully suported
 
 // Event Handling
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-static USHORT sal_GetCode( int state )
+static sal_uInt16 sal_GetCode( int state )
 {
-    USHORT nCode = 0;
+    sal_uInt16 nCode = 0;
 
     if( state & Button1Mask )
         nCode |= MOUSE_LEFT;
@@ -2852,7 +2852,7 @@ SalFrame::SalPointerState X11SalFrame::GetPointerState()
 long X11SalFrame::HandleMouseEvent( XEvent *pEvent )
 {
     SalMouseEvent       aMouseEvt;
-    USHORT              nEvent = 0;
+    sal_uInt16              nEvent = 0;
     bool                bClosePopups = false;
 
     if( nVisibleFloats && pEvent->type == EnterNotify )
@@ -2978,7 +2978,7 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent )
             }
             if( ! bInside )
             {
-                // need not take care of the XUngrabPointer in Show( FALSE )
+                // need not take care of the XUngrabPointer in Show( sal_False )
                 // because XUngrabPointer does not produce errors if pointer
                 // is not grabbed
                 XUngrabPointer( GetXDisplay(), CurrentTime );
@@ -3062,7 +3062,7 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent )
             if( pEvent->type == ButtonRelease )
                 return 0;
 
-            static ULONG        nLines = 0;
+            static sal_uLong        nLines = 0;
             if( ! nLines )
             {
                 char* pEnv = getenv( "SAL_WHEELLINES" );
@@ -3124,14 +3124,14 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent )
 // in the independent part.
 struct KeyAlternate
 {
-    USHORT          nKeyCode;
+    sal_uInt16          nKeyCode;
     sal_Unicode     nCharCode;
     KeyAlternate() : nKeyCode( 0 ), nCharCode( 0 ) {}
-    KeyAlternate( USHORT nKey, sal_Unicode nChar = 0 ) : nKeyCode( nKey ), nCharCode( nChar ) {}
+    KeyAlternate( sal_uInt16 nKey, sal_Unicode nChar = 0 ) : nKeyCode( nKey ), nCharCode( nChar ) {}
 };
 
 inline KeyAlternate
-GetAlternateKeyCode( const USHORT nKeyCode )
+GetAlternateKeyCode( const sal_uInt16 nKeyCode )
 {
     KeyAlternate aAlternate;
 
@@ -3156,7 +3156,7 @@ void X11SalFrame::beginUnicodeSequence()
 
     if( ! aDeleteWatch.isDeleted() )
     {
-        USHORT nTextAttr = SAL_EXTTEXTINPUT_ATTR_UNDERLINE;
+        sal_uInt16 nTextAttr = SAL_EXTTEXTINPUT_ATTR_UNDERLINE;
         SalExtTextInputEvent aEv;
         aEv.mnTime          = 0;
         aEv.maText          = rSeq;
@@ -3164,7 +3164,7 @@ void X11SalFrame::beginUnicodeSequence()
         aEv.mnCursorPos     = 0;
         aEv.mnDeltaStart    = 0;
         aEv.mnCursorFlags   = 0;
-        aEv.mbOnlyCursor    = FALSE;
+        aEv.mbOnlyCursor    = sal_False;
 
         CallCallback(SALEVENT_EXTTEXTINPUT, (void*)&aEv);
     }
@@ -3185,7 +3185,7 @@ bool X11SalFrame::appendUnicodeSequence( sal_Unicode c )
             aBuf.append( rSeq );
             aBuf.append( c );
             rSeq = aBuf.makeStringAndClear();
-            std::vector<USHORT> attribs( rSeq.getLength(), SAL_EXTTEXTINPUT_ATTR_UNDERLINE );
+            std::vector<sal_uInt16> attribs( rSeq.getLength(), SAL_EXTTEXTINPUT_ATTR_UNDERLINE );
 
             SalExtTextInputEvent aEv;
             aEv.mnTime          = 0;
@@ -3194,7 +3194,7 @@ bool X11SalFrame::appendUnicodeSequence( sal_Unicode c )
             aEv.mnCursorPos     = 0;
             aEv.mnDeltaStart    = 0;
             aEv.mnCursorFlags   = 0;
-            aEv.mbOnlyCursor    = FALSE;
+            aEv.mbOnlyCursor    = sal_False;
 
             CallCallback(SALEVENT_EXTTEXTINPUT, (void*)&aEv);
             bRet = true;
@@ -3219,7 +3219,7 @@ bool X11SalFrame::endUnicodeSequence()
         sal_Int32 nValue = aNumbers.toInt32( 16 );
         if( nValue >= 32 )
         {
-            USHORT nTextAttr = SAL_EXTTEXTINPUT_ATTR_UNDERLINE;
+            sal_uInt16 nTextAttr = SAL_EXTTEXTINPUT_ATTR_UNDERLINE;
             SalExtTextInputEvent aEv;
             aEv.mnTime          = 0;
             aEv.maText          = rtl::OUString( sal_Unicode(nValue) );
@@ -3227,7 +3227,7 @@ bool X11SalFrame::endUnicodeSequence()
             aEv.mnCursorPos     = 0;
             aEv.mnDeltaStart    = 0;
             aEv.mnCursorFlags   = 0;
-            aEv.mbOnlyCursor    = FALSE;
+            aEv.mbOnlyCursor    = sal_False;
             CallCallback(SALEVENT_EXTTEXTINPUT, (void*)&aEv);
         }
     }
@@ -3272,8 +3272,8 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
      }
 
     SalKeyEvent aKeyEvt;
-    USHORT      nKeyCode;
-    USHORT nModCode = 0;
+    sal_uInt16      nKeyCode;
+    sal_uInt16 nModCode = 0;
     char        aDummy;
 
     if( pEvent->state & ShiftMask )
@@ -3306,8 +3306,8 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
         // the event state does not contain ControlMask. In the release
         // event its the other way round: it does contain the Control mask.
         // The modifier mode therefore has to be adapted manually.
-        USHORT nExtModMask = 0;
-        USHORT nModMask = 0;
+        sal_uInt16 nExtModMask = 0;
+        sal_uInt16 nModMask = 0;
         switch( nKeySym )
         {
             case XK_Control_L:
@@ -3413,7 +3413,7 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
 
     if( nModCode == (KEY_SHIFT | KEY_MOD1) && pEvent->type == XLIB_KeyPress )
     {
-        USHORT nSeqKeyCode = pDisplay_->GetKeyCode( nUnmodifiedKeySym, &aDummy );
+        sal_uInt16 nSeqKeyCode = pDisplay_->GetKeyCode( nUnmodifiedKeySym, &aDummy );
         if( nSeqKeyCode == KEY_U )
         {
             beginUnicodeSequence();
@@ -3598,7 +3598,7 @@ long X11SalFrame::HandleFocusEvent( XFocusChangeEvent *pEvent )
             if ((mpParent != NULL && nStyle_ == 0)
                 && pSVData->maWinData.mpFirstFloat )
             {
-                ULONG nMode = pSVData->maWinData.mpFirstFloat->GetPopupModeFlags();
+                sal_uLong nMode = pSVData->maWinData.mpFirstFloat->GetPopupModeFlags();
                 pSVData->maWinData.mpFirstFloat->SetPopupModeFlags(
                                         nMode & ~(FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE));
             }
@@ -3621,7 +3621,7 @@ long X11SalFrame::HandleFocusEvent( XFocusChangeEvent *pEvent )
 long X11SalFrame::HandleExposeEvent( XEvent *pEvent )
 {
     XRectangle  aRect = { 0, 0, 0, 0 };
-    USHORT      nCount = 0;
+    sal_uInt16      nCount = 0;
 
     if( pEvent->type == Expose )
     {
@@ -3812,9 +3812,9 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent )
     XLIB_Window     hWM_Parent;
     XLIB_Window     hRoot, *Children, hDummy;
     unsigned int    nChildren;
-    BOOL            bNone = pDisplay_->GetProperties()
+    sal_Bool            bNone = pDisplay_->GetProperties()
                             & PROPERTY_SUPPORT_WM_Parent_Pixmap_None;
-    BOOL            bAccessParentWindow = ! (pDisplay_->GetProperties()
+    sal_Bool            bAccessParentWindow = ! (pDisplay_->GetProperties()
                             & PROPERTY_FEATURE_TrustedSolaris);
 
     static const char* pDisableStackingCheck = getenv( "SAL_DISABLE_STACKING_CHECK" );
@@ -3843,8 +3843,8 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent )
             hWM_Parent = GetShellWindow();
             break;
         }
-         /* #107048# this sometimes happens if a Show(TRUE) is
-         *  immediately followed by Show(FALSE) (which is braindead anyway)
+         /* #107048# this sometimes happens if a Show(sal_True) is
+         *  immediately followed by Show(sal_False) (which is braindead anyway)
          */
         if(  hDummy == hWM_Parent )
             hDummy = hRoot;
@@ -4190,7 +4190,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
 
     if( -1 == nCaptured_ )
     {
-        CaptureMouse( TRUE );
+        CaptureMouse( sal_True );
 #ifdef DBG_UTIL
         if( -1 != nCaptured_ )
             pDisplay_->PrintEvent( "Captured", pEvent );
@@ -4261,9 +4261,9 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
                             XUnmapWindow( GetXDisplay(), GetShellWindow() );
                         break;
                     }
-                    bMapped_   = TRUE;
-                    bViewable_ = TRUE;
-                    nRet = TRUE;
+                    bMapped_   = sal_True;
+                    bViewable_ = sal_True;
+                    nRet = sal_True;
                     if ( mpInputContext != NULL )
                         mpInputContext->Map( this );
                     CallCallback( SALEVENT_RESIZE, NULL );
@@ -4351,7 +4351,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
 
 
                     RestackChildren();
-                    mbInShow = FALSE;
+                    mbInShow = sal_False;
                     m_bSetFocusOnMap = false;
                 }
                 break;
@@ -4359,9 +4359,9 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
             case UnmapNotify:
                 if( pEvent->xunmap.window == GetShellWindow() )
                 {
-                    bMapped_   = FALSE;
-                    bViewable_ = FALSE;
-                    nRet = TRUE;
+                    bMapped_   = sal_False;
+                    bViewable_ = sal_False;
+                    nRet = sal_True;
                     if ( mpInputContext != NULL )
                         mpInputContext->Unmap( this );
                     CallCallback( SALEVENT_RESIZE, NULL );
@@ -4376,7 +4376,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
 
             case VisibilityNotify:
                 nVisibility_ = pEvent->xvisibility.state;
-                nRet = TRUE;
+                nRet = sal_True;
                 if( bAlwaysOnTop_
                     && bMapped_
                     && ! GetDisplay()->getWMAdaptor()->isAlwaysOnTopOK()
@@ -4475,7 +4475,7 @@ void X11SalFrame::ResetClipRegion()
                               op, ordering );
 }
 
-void X11SalFrame::BeginSetClipRegion( ULONG nRects )
+void X11SalFrame::BeginSetClipRegion( sal_uLong nRects )
 {
     if( m_pClipRectangles )
         delete [] m_pClipRectangles;
diff --git a/vcl/unx/source/window/salobj.cxx b/vcl/unx/source/window/salobj.cxx
index 2ff6d05c35c6..93aeeba66ee8 100644
--- a/vcl/unx/source/window/salobj.cxx
+++ b/vcl/unx/source/window/salobj.cxx
@@ -55,12 +55,12 @@
 // =======================================================================
 // SalInstance member to create and destroy a SalObject
 
-SalObject* X11SalInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow )
+SalObject* X11SalInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow )
 {
     return X11SalObject::CreateObject( pParent, pWindowData, bShow );
 }
 
-X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow )
+X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow )
 {
     int error_base, event_base;
     X11SalObject*       pObject  = new X11SalObject();
@@ -152,7 +152,7 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p
                            pVisual,
                            CWEventMask|CWColormap, &aAttribs );
         XSync( pDisp, False );
-        BOOL bWasXError = pSalDisp->GetXLib()->HasXErrorOccured();
+        sal_Bool bWasXError = pSalDisp->GetXLib()->HasXErrorOccured();
         pSalDisp->GetXLib()->PopXErrorLevel();
         if( bWasXError )
         {
@@ -179,7 +179,7 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p
     pObjData->pAppContext   = NULL;
 
     XSync(pDisp, False);
-    BOOL bWasXError = pSalDisp->GetXLib()->HasXErrorOccured();
+    sal_Bool bWasXError = pSalDisp->GetXLib()->HasXErrorOccured();
     pSalDisp->GetXLib()->PopXErrorLevel();
     if( bWasXError )
     {
@@ -219,7 +219,7 @@ SalClipRegion::~SalClipRegion()
 
 
 void
-SalClipRegion::BeginSetClipRegion( ULONG nRects )
+SalClipRegion::BeginSetClipRegion( sal_uLong nRects )
 {
     if (ClipRectangleList)
         delete [] ClipRectangleList;
@@ -324,7 +324,7 @@ X11SalObject::ResetClipRegion()
 
 
 void
-X11SalObject::BeginSetClipRegion( ULONG nRectCount )
+X11SalObject::BeginSetClipRegion( sal_uLong nRectCount )
 {
     maClipRegion.BeginSetClipRegion ( nRectCount );
 }
@@ -375,7 +375,7 @@ X11SalObject::EndSetClipRegion()
 }
 
 
-USHORT
+sal_uInt16
 X11SalObject::GetClipRegionType()
 {
     return maClipRegion.GetClipRegionType();
@@ -399,7 +399,7 @@ X11SalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight )
 
 
 void
-X11SalObject::Show( BOOL bVisible )
+X11SalObject::Show( sal_Bool bVisible )
 {
     if  ( ! maSystemChildData.aWindow )
         return;
@@ -420,7 +420,7 @@ X11SalObject::Show( BOOL bVisible )
 
 // -----------------------------------------------------------------------
 
-void X11SalObject::Enable( BOOL )
+void X11SalObject::Enable( sal_Bool )
 {
 }
 
@@ -454,9 +454,9 @@ const SystemChildData* X11SalObject::GetSystemData() const
     return &maSystemChildData;
 }
 
-static USHORT sal_GetCode( int state )
+static sal_uInt16 sal_GetCode( int state )
 {
-    USHORT nCode = 0;
+    sal_uInt16 nCode = 0;
 
     if( state & Button1Mask )
         nCode |= MOUSE_LEFT;
@@ -512,7 +512,7 @@ long X11SalObject::Dispatch( XEvent* pEvent )
                 aEvt.mnTime     = pEvent->xbutton.time;
                 aEvt.mnCode     = sal_GetCode( pEvent->xbutton.state );
                 aEvt.mnButton   = 0;
-                USHORT nEvent = 0;
+                sal_uInt16 nEvent = 0;
                 if( pEvent->type == ButtonPress ||
                     pEvent->type == ButtonRelease )
                 {
@@ -537,10 +537,10 @@ long X11SalObject::Dispatch( XEvent* pEvent )
                 switch( pEvent->type )
                 {
                     case UnmapNotify:
-                    pObject->mbVisible = FALSE;
+                    pObject->mbVisible = sal_False;
                     return 1;
                     case MapNotify:
-                    pObject->mbVisible = TRUE;
+                    pObject->mbVisible = sal_True;
                     return 1;
                     case ButtonPress:
                     pObject->CallCallback( SALOBJ_EVENT_TOTOP, NULL );