1 files changed, 11 insertions, 11 deletions
diff --git a/svx/inc/svx/xbitmap.hxx b/svx/inc/svx/xbitmap.hxx
index f3b2d98c138d..89104131a16a 100644
--- a/svx/inc/svx/xbitmap.hxx
+++ b/svx/inc/svx/xbitmap.hxx
@@ -50,22 +50,22 @@ protected:
     XBitmapType     eType;
     XBitmapStyle    eStyle;
     GraphicObject   aGraphicObject;
-    USHORT*         pPixelArray;
+    sal_uInt16*         pPixelArray;
     Size            aArraySize;
     Color           aPixelColor;
     Color           aBckgrColor;
-    BOOL            bGraphicDirty;
+    sal_Bool            bGraphicDirty;
 
 public:
     XOBitmap();
     XOBitmap( const GraphicObject& rGraphicObject, XBitmapStyle eStyle = XBITMAP_TILE );
     XOBitmap( const Bitmap& rBitmap, XBitmapStyle eStyle = XBITMAP_TILE );
 #if defined HP9000 || defined SINIX
-    XOBitmap( const USHORT* pArray, const Color& aPixelColor,
+    XOBitmap( const sal_uInt16* pArray, const Color& aPixelColor,
              const Color& aBckgrColor, const Size& rSize = aXOBitmapDefaultSize,
              XBitmapStyle eStyle = XBITMAP_TILE );
 #else
-    XOBitmap( const USHORT* pArray, const Color& aPixelColor,
+    XOBitmap( const sal_uInt16* pArray, const Color& aPixelColor,
              const Color& aBckgrColor, const Size& rSize = Size( 8, 8 ),
              XBitmapStyle eStyle = XBITMAP_TILE );
 #endif
@@ -78,20 +78,20 @@ public:
     void Bitmap2Array();
     void Array2Bitmap();
 
-    void SetGraphicObject( const GraphicObject& rObj )  { aGraphicObject = rObj; bGraphicDirty = FALSE; }
-    void SetBitmap( const Bitmap& rBmp )                { aGraphicObject = GraphicObject( Graphic( rBmp ) ); bGraphicDirty = FALSE; }
+    void SetGraphicObject( const GraphicObject& rObj )  { aGraphicObject = rObj; bGraphicDirty = sal_False; }
+    void SetBitmap( const Bitmap& rBmp )                { aGraphicObject = GraphicObject( Graphic( rBmp ) ); bGraphicDirty = sal_False; }
     void SetBitmapType( XBitmapType eNewType )          { eType = eNewType; }
     void SetBitmapStyle( XBitmapStyle eNewStyle )       { eStyle = eNewStyle; }
-    void SetPixelArray( const USHORT* pArray );
-    void SetPixelSize( const Size& rSize )              { aArraySize  = rSize;  bGraphicDirty = TRUE; }
-    void SetPixelColor( const Color& rColor )           { aPixelColor = rColor; bGraphicDirty = TRUE; }
-    void SetBackgroundColor( const Color& rColor )      { aBckgrColor = rColor; bGraphicDirty = TRUE; }
+    void SetPixelArray( const sal_uInt16* pArray );
+    void SetPixelSize( const Size& rSize )              { aArraySize  = rSize;  bGraphicDirty = sal_True; }
+    void SetPixelColor( const Color& rColor )           { aPixelColor = rColor; bGraphicDirty = sal_True; }
+    void SetBackgroundColor( const Color& rColor )      { aBckgrColor = rColor; bGraphicDirty = sal_True; }
 
     XBitmapType             GetBitmapType() const               { return eType; }
     XBitmapStyle            GetBitmapStyle() const              { return eStyle; }
     const GraphicObject&    GetGraphicObject() const;
     Bitmap                  GetBitmap() const;
-    USHORT*                 GetPixelArray() const               { return pPixelArray; }
+    sal_uInt16*                 GetPixelArray() const               { return pPixelArray; }
     Color                   GetPixelColor() const               { return aPixelColor; }
     Color                   GetBackgroundColor() const          { return aBckgrColor; }
 };