1 files changed, 14 insertions, 14 deletions

diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 54c978b47794..266d3cd41be7 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -152,7 +152,7 @@ inline GC X11SalGraphics::GetMonoGC( Pixmap hPixmap )
     if( !bMonoGC_ )
     {
         SetClipRegion( pMonoGC_ );
-        bMonoGC_ = TRUE;
+        bMonoGC_ = sal_True;
     }
 
     return pMonoGC_;
@@ -169,7 +169,7 @@ inline GC X11SalGraphics::GetCopyGC()
     if( !bCopyGC_ )
     {
         SetClipRegion( pCopyGC_ );
-        bCopyGC_ = TRUE;
+        bCopyGC_ = sal_True;
     }
     return pCopyGC_;
 }
@@ -187,7 +187,7 @@ GC X11SalGraphics::GetInvertGC()
     if( !bInvertGC_ )
     {
         SetClipRegion( pInvertGC_ );
-        bInvertGC_ = TRUE;
+        bInvertGC_ = sal_True;
     }
     return pInvertGC_;
 }
@@ -235,7 +235,7 @@ GC X11SalGraphics::GetInvert50GC()
     if( !bInvert50GC_ )
     {
         SetClipRegion( pInvert50GC_ );
-        bInvert50GC_ = TRUE;
+        bInvert50GC_ = sal_True;
     }
     return pInvert50GC_;
 }
@@ -253,7 +253,7 @@ inline GC X11SalGraphics::GetStippleGC()
     {
         XSetFunction( GetXDisplay(), pStippleGC_, bXORMode_ ? GXxor : GXcopy );
         SetClipRegion( pStippleGC_ );
-        bStippleGC_ = TRUE;
+        bStippleGC_ = sal_True;
     }
 
     return pStippleGC_;
@@ -610,7 +610,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;
 
@@ -663,11 +663,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 );
     }
@@ -688,7 +688,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,
@@ -747,8 +747,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(),
@@ -836,7 +836,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!
@@ -881,7 +881,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;
@@ -1047,7 +1047,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;