Kaydet (Commit) 1805392e authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl Kaydeden (comit) Tomaž Vajngerl

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/33687Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarTomaž Vajngerl <quikee@gmail.com>
üst 2b95261b
...@@ -1432,18 +1432,22 @@ void MetaTextLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) ...@@ -1432,18 +1432,22 @@ void MetaTextLineAction::Read( SvStream& rIStm, ImplMetaReadData* )
sal_Int32 nTempWidth(0); sal_Int32 nTempWidth(0);
ReadPair( rIStm, maPos ); ReadPair( rIStm, maPos );
rIStm.ReadInt32( nTempWidth ); rIStm.ReadInt32(nTempWidth);
mnWidth = nTempWidth; mnWidth = nTempWidth;
sal_uInt32 nTempStrikeout(0); sal_uInt32 nTempStrikeout(0);
rIStm.ReadUInt32( nTempStrikeout ); rIStm.ReadUInt32( nTempStrikeout );
meStrikeout = (FontStrikeout)nTempStrikeout; meStrikeout = (FontStrikeout)nTempStrikeout;
sal_uInt32 nTempUnderline(0); sal_uInt32 nTempUnderline(0);
rIStm.ReadUInt32( nTempUnderline ); rIStm.ReadUInt32( nTempUnderline );
meUnderline = (FontLineStyle)nTempUnderline; meUnderline = (FontLineStyle)nTempUnderline;
if ( aCompat.GetVersion() >= 2 ) {
sal_uInt32 nTempUnderline2(0); if (aCompat.GetVersion() >= 2)
rIStm.ReadUInt32(nTempUnderline2); {
meUnderline = (FontLineStyle)nTempUnderline2; sal_uInt32 nTempOverline(0);
rIStm.ReadUInt32(nTempOverline);
meOverline = (FontLineStyle)nTempOverline;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment