summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-07-12 11:15:53 +0000
committerKurt Zenker <kz@openoffice.org>2005-07-12 11:15:53 +0000
commit5203c873e810b9395944cfb719653409936dc491 (patch)
tree6c56c72ee6ab1b8d8a249d49122710b40908662c /vcl/source
parent54a7cfa7f740c1dfabfe6b389dbee036dbaacf19 (diff)
INTEGRATION: CWS mav18 (1.14.130); FILE MERGED
2005/07/07 14:15:41 mav 1.14.130.1: #i49496# fixing the problem with parsing of a simple bitmap
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/gdi/bitmapex.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 709233ac0ca2..281e519997af 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: bitmapex.cxx,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: rt $ $Date: 2005-03-29 14:37:15 $
+ * last change: $Author: kz $ $Date: 2005-07-12 12:15:53 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -789,6 +789,7 @@ SvStream& operator>>( SvStream& rIStm, BitmapEx& rBitmapEx )
if( ( nMagic1 != 0x25091962 ) || ( nMagic2 != 0xACB20201 ) || rIStm.GetError() )
{
+ rIStm.ResetError();
rIStm.Seek( nStmPos );
rBitmapEx = aBmp;
}