diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-06-09 14:05:58 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-06-09 14:05:58 +0000 |
| commit | c0dc97221df27a3984ff82dae84785f748285bd5 (patch) | |
| tree | b6ede00e0759435234519ce511dcd3913f3d53a3 /svtools | |
| parent | 7650c0e7bddd44c4ed0abeb0505b3c75865314cd (diff) | |
INTEGRATION: CWS impress141 (1.10.12); FILE MERGED
2008/04/24 14:26:49 sj 1.10.12.1: #b6244077# fixed crash when importing xpm file (added support of 2bit graphics)
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/filter.vcl/ixpm/xpmread.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/svtools/source/filter.vcl/ixpm/xpmread.cxx b/svtools/source/filter.vcl/ixpm/xpmread.cxx index bacd3361a94e..0aa070e41596 100644 --- a/svtools/source/filter.vcl/ixpm/xpmread.cxx +++ b/svtools/source/filter.vcl/ixpm/xpmread.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xpmread.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.11 $ * * This file is part of OpenOffice.org. * @@ -135,10 +135,8 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic ) nBits = 24; else if ( mnColors > 16 ) nBits = 8; - else if ( mnColors > 4 ) - nBits = 4; else if ( mnColors > 2 ) - nBits = 2; + nBits = 4; else nBits = 1; |