diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-09 10:34:16 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-09 10:34:16 +0000 |
| commit | fe3e65e857e5e1304e3012ea56da2a642238bf1a (patch) | |
| tree | 41b018b5b7f65b1a4f86df7772b4d63872b252b8 /goodies | |
| parent | 445a4482e9a51fab590817c37fa68462c75d3786 (diff) | |
INTEGRATION: CWS ooo20040815 (1.2.232); FILE MERGED
2004/08/04 12:53:47 waratah 1.2.232.1: #i32569# add an initialisation to one variable
reorder definitions to match class definition
Diffstat (limited to 'goodies')
| -rw-r--r-- | goodies/source/filter.vcl/iras/iras.cxx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/goodies/source/filter.vcl/iras/iras.cxx b/goodies/source/filter.vcl/iras/iras.cxx index 0e70de646659..c49360b47951 100644 --- a/goodies/source/filter.vcl/iras/iras.cxx +++ b/goodies/source/filter.vcl/iras/iras.cxx @@ -2,9 +2,9 @@ * * $RCSfile: iras.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: sj $ $Date: 2001-03-08 15:50:31 $ + * last change: $Author: hr $ $Date: 2004-09-09 11:34:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -110,10 +110,10 @@ public: //=================== Methoden von RASReader ============================== RASReader::RASReader() : - mpAcc ( NULL ), mbStatus ( TRUE ), - mbPalette ( FALSE ), - mnRepCount ( 0 ) + mpAcc ( NULL ), + mnRepCount ( 0 ), + mbPalette ( FALSE ) { } @@ -274,7 +274,8 @@ BOOL RASReader::ImplReadHeader() BOOL RASReader::ImplReadBody() { ULONG x, y; - BYTE nDat, nRed, nGreen, nBlue; + BYTE nDat = 0; + BYTE nRed, nGreen, nBlue; switch ( mnDstBitsPerPix ) { case 1 : @@ -411,8 +412,9 @@ extern "C" BOOL GraphicImport(SvStream & rStream, Graphic & rGraphic, } //================== ein bischen Muell fuer Windows ========================== - +#ifndef GCC #pragma hdrstop +#endif #ifdef WIN |