diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-09 10:33:13 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-09 10:33:13 +0000 |
| commit | cf20c47ad633bb44c18d21d2eda10af7937da187 (patch) | |
| tree | 990d77d3027953d93a4bf080dbe26975af8ac49b /goodies | |
| parent | 82734be53a2a68bb4e4ec1fe42ef257d8680055a (diff) | |
INTEGRATION: CWS ooo20040815 (1.5.62); FILE MERGED
2004/08/04 13:03:25 waratah 1.5.62.1: #i32569# add default clause to case with comment
remove a pramga for gcc builds
Diffstat (limited to 'goodies')
| -rw-r--r-- | goodies/source/filter.vcl/ios2met/ios2met.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/goodies/source/filter.vcl/ios2met/ios2met.cxx b/goodies/source/filter.vcl/ios2met/ios2met.cxx index 4cbcc0b4dafb..6a8a089c52b4 100644 --- a/goodies/source/filter.vcl/ios2met/ios2met.cxx +++ b/goodies/source/filter.vcl/ios2met/ios2met.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ios2met.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: vg $ $Date: 2004-01-06 15:06:28 $ + * last change: $Author: hr $ $Date: 2004-09-09 11:33:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -725,6 +725,8 @@ void OS2METReader::SetPen( const Color& rColor, USHORT nLineWidth, PenStyle ePen aLineInfo.SetDashLen( nLineWidth << 2 ); eLineStyle = LINE_DASH; break; + case PEN_SOLID: + break; // -Wall not handled... } aLineInfo.SetStyle( eLineStyle ); } @@ -2134,6 +2136,7 @@ void OS2METReader::ReadDsc(USHORT nDscID, USHORT /*nDscLen*/) b32=FALSE; else { + b32 = FALSE; // -Wall added the case. pOS2MET->SetError(SVSTREAM_FILEFORMAT_ERROR); ErrorCode=2; } @@ -2814,8 +2817,9 @@ extern "C" BOOL GraphicImport(SvStream & rStream, Graphic & rGraphic, } //================== ein bischen Muell fuer Windows ========================== - +#ifndef GCC #pragma hdrstop +#endif #ifdef WIN |