Kaydet (Commit) f84f5b0a authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Fix reading 16 bit millisecond value

It had originally been read as 16 bit via >> in
d2000efb "#i106421#: move msfilter to filter",
then accidentally changed to be read as 32 bit via >> in
9830fd36 "date/time IDL datatypes incompatible
change" (and later changed to be read as 32 bit explicitly via ReadUInt32 with
15535e32 "convert SvStream::operator>> methods
to ReadXXX methods").

Change-Id: I5062e67a578d182a0df2726ab8d0bae465f154f3
Reviewed-on: https://gerrit.libreoffice.org/64604Reviewed-by: 's avatarLionel Elie Mamane <lionel@mamane.lu>
Tested-by: Jenkins
üst ca30a203
...@@ -2704,6 +2704,7 @@ static void ImportComment10( SvxMSDffManager const & rMan, SvStream& rStCtrl, Sd ...@@ -2704,6 +2704,7 @@ static void ImportComment10( SvxMSDffManager const & rMan, SvStream& rStCtrl, Sd
case PPT_PST_CommentAtom10 : case PPT_PST_CommentAtom10 :
{ {
sal_uInt16 millisec = 0;
rStCtrl.ReadInt32( nIndex ) rStCtrl.ReadInt32( nIndex )
.ReadInt16( aDateTime.Year ) .ReadInt16( aDateTime.Year )
.ReadUInt16( aDateTime.Month ) .ReadUInt16( aDateTime.Month )
...@@ -2712,11 +2713,11 @@ static void ImportComment10( SvxMSDffManager const & rMan, SvStream& rStCtrl, Sd ...@@ -2712,11 +2713,11 @@ static void ImportComment10( SvxMSDffManager const & rMan, SvStream& rStCtrl, Sd
.ReadUInt16( aDateTime.Hours ) .ReadUInt16( aDateTime.Hours )
.ReadUInt16( aDateTime.Minutes ) .ReadUInt16( aDateTime.Minutes )
.ReadUInt16( aDateTime.Seconds ) .ReadUInt16( aDateTime.Seconds )
.ReadUInt32( aDateTime.NanoSeconds ) .ReadUInt16( millisec )
.ReadInt32( nPosX ) .ReadInt32( nPosX )
.ReadInt32( nPosY ); .ReadInt32( nPosY );
aDateTime.NanoSeconds *= ::tools::Time::nanoPerMilli; aDateTime.NanoSeconds = millisec * ::tools::Time::nanoPerMilli;
} }
break; break;
} }
......
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