1 files changed, 31 insertions, 31 deletions

diff --git a/svtools/inc/svtools/fltdefs.hxx b/svtools/inc/svtools/fltdefs.hxx
index 86462c2faa33..fa987d912588 100644
--- a/svtools/inc/svtools/fltdefs.hxx
+++ b/svtools/inc/svtools/fltdefs.hxx
@@ -40,12 +40,12 @@
 
 typedef struct RGBQUAD
 {
-    BYTE    rgbBlue;
-    BYTE    rgbGreen;
-    BYTE    rgbRed;
-    BYTE    rgbReserved;
+    sal_uInt8   rgbBlue;
+    sal_uInt8   rgbGreen;
+    sal_uInt8   rgbRed;
+    sal_uInt8   rgbReserved;
 
-            RGBQUAD( const BYTE cRed = 0, const BYTE cGreen = 0, const BYTE cBlue = 0 ) :
+            RGBQUAD( const sal_uInt8 cRed = 0, const sal_uInt8 cGreen = 0, const sal_uInt8 cBlue = 0 ) :
                 rgbBlue     ( cBlue ),
                 rgbGreen    ( cGreen ),
                 rgbRed      ( cRed ),
@@ -53,7 +53,7 @@ typedef struct RGBQUAD
 } RGBQUAD;
 
 
-typedef BYTE* PDIBBYTE;
+typedef sal_uInt8* PDIBBYTE;
 #define MEMCPY memcpy
 #define MEMSET memset
 #define GLOBALALLOC(nSize) ((PDIBBYTE)GlobalAlloc(GMEM_FIXED,(nSize)))
@@ -62,18 +62,18 @@ typedef BYTE* PDIBBYTE;
 
 #else
 
-typedef BYTE* PDIBBYTE;
+typedef sal_uInt8* PDIBBYTE;
 #define MEMCPY memcpy
 #define MEMSET memset
-#define GLOBALALLOC(nSize) ((PDIBBYTE)new BYTE[(nSize)])
+#define GLOBALALLOC(nSize) ((PDIBBYTE)new sal_uInt8[(nSize)])
 #define GLOBALFREE(pPointer) (delete[] (pPointer))
 
 #endif
 
 
 #if defined ( OS2 ) || defined ( UNX )
-void ReadBitmap( SvStream& rIStream, Bitmap& rBmp, USHORT nDefaultHeight = 0, ULONG nOffBits = 0 );
-void ReplaceInfoHeader( SvStream& rStm, BYTE* pBuffer );
+void ReadBitmap( SvStream& rIStream, Bitmap& rBmp, sal_uInt16 nDefaultHeight = 0, sal_uLong nOffBits = 0 );
+void ReplaceInfoHeader( SvStream& rStm, sal_uInt8* pBuffer );
 
 #ifdef OS2
 #define RGBQUAD             RGBQUADOS2
@@ -87,12 +87,12 @@ void ReplaceInfoHeader( SvStream& rStm, BYTE* pBuffer );
 
 typedef struct RGBQUAD
 {
-    BYTE    rgbBlue;
-    BYTE    rgbGreen;
-    BYTE    rgbRed;
-    BYTE    rgbReserved;
+    sal_uInt8   rgbBlue;
+    sal_uInt8   rgbGreen;
+    sal_uInt8   rgbRed;
+    sal_uInt8   rgbReserved;
 
-            RGBQUAD( const BYTE cRed = 0, const BYTE cGreen = 0, const BYTE cBlue = 0 ) :
+            RGBQUAD( const sal_uInt8 cRed = 0, const sal_uInt8 cGreen = 0, const sal_uInt8 cBlue = 0 ) :
                 rgbBlue     ( cBlue ),
                 rgbGreen    ( cGreen ),
                 rgbRed      ( cRed ),
@@ -101,27 +101,27 @@ typedef struct RGBQUAD
 
 typedef struct BITMAPFILEHEADER
 {
-    UINT16  bfType;
-    UINT32  bfSize;
-    UINT16  bfReserved1;
-    UINT16  bfReserved2;
-    UINT32  bfOffBits;
+    sal_uInt16  bfType;
+    sal_uInt32  bfSize;
+    sal_uInt16  bfReserved1;
+    sal_uInt16  bfReserved2;
+    sal_uInt32  bfOffBits;
 } BITMAPFILEHEADER;
 typedef BITMAPFILEHEADER* PBITMAPFILEHEADER;
 
 typedef struct BITMAPINFOHEADER
 {
-    UINT32  biSize;
-    UINT32  biWidth;
-    UINT32  biHeight;
-    UINT16  biPlanes;
-    UINT16  biBitCount;
-    UINT32  biCompression;
-    UINT32  biSizeImage;
-    UINT32  biXPelsPerMeter;
-    UINT32  biYPelsPerMeter;
-    UINT32  biClrUsed;
-    UINT32  biClrImportant;
+    sal_uInt32  biSize;
+    sal_uInt32  biWidth;
+    sal_uInt32  biHeight;
+    sal_uInt16  biPlanes;
+    sal_uInt16  biBitCount;
+    sal_uInt32  biCompression;
+    sal_uInt32  biSizeImage;
+    sal_uInt32  biXPelsPerMeter;
+    sal_uInt32  biYPelsPerMeter;
+    sal_uInt32  biClrUsed;
+    sal_uInt32  biClrImportant;
 } BITMAPINFOHEADER;
 typedef BITMAPINFOHEADER* PBITMAPINFOHEADER;