summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-07-12 11:16:06 +0000
committerKurt Zenker <kz@openoffice.org>2005-07-12 11:16:06 +0000
commit919872626828e78dee146ac84f5b0a7653d00118 (patch)
tree84af29546e8c10fe0e0be5a0bf17daf28ad666d6 /vcl/source
parent5203c873e810b9395944cfb719653409936dc491 (diff)
INTEGRATION: CWS mav18 (1.18.220); FILE MERGED
2005/07/07 14:15:42 mav 1.18.220.1: #i49496# fixing the problem with parsing of a simple bitmap
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/gdi/impgraph.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 770329712d58..90a7eea9310b 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: impgraph.cxx,v $
*
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
- * last change: $Author: hr $ $Date: 2004-12-13 12:39:18 $
+ * last change: $Author: kz $ $Date: 2005-07-12 12:16:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1592,6 +1592,8 @@ SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic )
// (which skips loading its BmpEx if already done)
rImpGraphic.mpAnimation->SetBitmapEx(aBmpEx);
}
+ else
+ rIStm.ResetError();
}
else
{