diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2010-09-29 18:06:23 +0200 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2010-09-29 18:06:23 +0200 |
| commit | 23bfb3338707c9499f5ed9bedc4826b24ca1511e (patch) | |
| tree | 33ab1b6c1a4e768f4071002714cb8b65c7f790da /svtools | |
| parent | bd726dfa8cb20a2c695c26fd15409e156267c31a (diff) | |
fix a merge problem
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/filter.vcl/filter/filter2.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/svtools/source/filter.vcl/filter/filter2.cxx b/svtools/source/filter.vcl/filter/filter2.cxx index 5accda061df0..d91ec1a19772 100644 --- a/svtools/source/filter.vcl/filter/filter2.cxx +++ b/svtools/source/filter.vcl/filter/filter2.cxx @@ -1115,6 +1115,8 @@ BOOL GraphicDescriptor::ImpDetectPCT( SvStream& rStm, BOOL ) nFormat = GFF_PCT; else { + sal_Int32 nStmPos = rStm.Tell(); + BYTE sBuf[4]; rStm.SeekRel( 522 ); |