diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2017-01-30 09:20:33 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2017-01-30 15:25:05 +0000 |
| commit | 1805392e1ca48b57c37b2a32edaa1ec1e2efe227 (patch) | |
| tree | e92694cdf2f6603de5b07b88095bb4f75c2bf676 /vcl | |
| parent | 2b95261bcc293b3adbebaa64764b91befc62fa30 (diff) | |
vcl: fix MetaTextLine reading, version 2 contains overline
Reading MetaTextLine version 2 was reading to meUnderline (twice)
and never read to meOverline. This is not consistent with Write
where in version 2 we write the content of meOverline.
Change-Id: If7911add5845ec3a01365d4ad8b8afaa6b2723dd
Reviewed-on: https://gerrit.libreoffice.org/33687
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/metaact.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 3ef9692b106a..05b24da91e1e 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -1432,18 +1432,22 @@ void MetaTextLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) sal_Int32 nTempWidth(0); ReadPair( rIStm, maPos ); - rIStm.ReadInt32( nTempWidth ); + rIStm.ReadInt32(nTempWidth); mnWidth = nTempWidth; + sal_uInt32 nTempStrikeout(0); rIStm.ReadUInt32( nTempStrikeout ); meStrikeout = (FontStrikeout)nTempStrikeout; + sal_uInt32 nTempUnderline(0); rIStm.ReadUInt32( nTempUnderline ); meUnderline = (FontLineStyle)nTempUnderline; - if ( aCompat.GetVersion() >= 2 ) { - sal_uInt32 nTempUnderline2(0); - rIStm.ReadUInt32(nTempUnderline2); - meUnderline = (FontLineStyle)nTempUnderline2; + + if (aCompat.GetVersion() >= 2) + { + sal_uInt32 nTempOverline(0); + rIStm.ReadUInt32(nTempOverline); + meOverline = (FontLineStyle)nTempOverline; } } |