strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS vcl89 (1.76.20); FILE MERGED

Browse source 
2008/05/07 12:08:57 pl 1.76.20.1: #i89111# remove static member abomination
This commit is contained in:
Kurt Zenker 2008-06-25 13:44:43 +00:00
parent 9e7403c508
commit ce64791a75
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
svtools/source/filter.vcl/filter/filter.cxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: filter.cxx,v $
* $Revision: 1.76 $
* $Revision: 1.77 $
*
* This file is part of OpenOffice.org.
*
@ -1399,16 +1399,12 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvS
// ignore animation for previews and set preview size
if( aPreviewSizeHint.Width() || aPreviewSizeHint.Height() )
{
vcl::PNGReader::SetPreviewSizeHint( aPreviewSizeHint );
// position the stream at the end of the image if requested
if( !bAllowPartialStreamRead )
aPNGReader.GetChunks();
}
else
{
vcl::PNGReader::DisablePreviewMode();
// check if this PNG contains a GIF chunk!
const std::vector< vcl::PNGReader::ChunkData >& rChunkData = aPNGReader.GetChunks();
std::vector< vcl::PNGReader::ChunkData >::const_iterator aIter( rChunkData.begin() );
@ -1434,7 +1430,7 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvS
if ( eLinkType == GFX_LINK_TYPE_NONE )
{
BitmapEx aBmpEx( aPNGReader.Read() );
BitmapEx aBmpEx( aPNGReader.Read( aPreviewSizeHint ) );
if ( aBmpEx.IsEmpty() )
nStatus = GRFILTER_FILTERERROR;
else