[Libreoffice-commits] core.git: Branch 'libreoffice-6-1-4' - filter/source

[Libreoffice Gerrit user]

 filter/source/msfilter/svdfppt.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit cde3b1fbdf2341c00afcefc42ae061b2970b4da3
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Dec 5 10:14:17 2018 +0100
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Wed Dec 12 09:40:14 2018 +0100

    Fix reading 16 bit millisecond value
    
    It had originally been read as 16 bit via >> in
    d2000efb31f864e912c6cf52760eea0e602b6893 "#i106421#: move msfilter to filter",
    then accidentally changed to be read as 32 bit via >> in
    9830fd36dbdb72c79703b0c61efc027fba793c5a "date/time IDL datatypes incompatible
    change" (and later changed to be read as 32 bit explicitly via ReadUInt32 with
    15535e32ddcfee451d4dbc9be9de0b8c9f9d78d4 "convert SvStream::operator>> methods
    to ReadXXX methods").
    
    Change-Id: I5062e67a578d182a0df2726ab8d0bae465f154f3
    Reviewed-on: https://gerrit.libreoffice.org/64604
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-by: Jenkins
    (cherry picked from commit f84f5b0a0cdb82f444de572f9d8554a96056f874)
    Reviewed-on: https://gerrit.libreoffice.org/64637
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index cc2fc42ad4a6..0f702e8f8531 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2705,6 +2705,7 @@ void ImportComment10( SvxMSDffManager const & rMan, SvStream& rStCtrl, SdrPage*
 
             case PPT_PST_CommentAtom10 :
             {
+                sal_uInt16 millisec = 0;
                 rStCtrl.ReadInt32( nIndex )
                        .ReadInt16( aDateTime.Year )
                        .ReadUInt16( aDateTime.Month )
@@ -2713,11 +2714,11 @@ void ImportComment10( SvxMSDffManager const & rMan, SvStream& rStCtrl, SdrPage*
                        .ReadUInt16( aDateTime.Hours )
                        .ReadUInt16( aDateTime.Minutes )
                        .ReadUInt16( aDateTime.Seconds )
-                       .ReadUInt32( aDateTime.NanoSeconds )
+                       .ReadUInt16( millisec )
                        .ReadInt32( nPosX )
                        .ReadInt32( nPosY );
 
-                aDateTime.NanoSeconds *= ::tools::Time::nanoPerMilli;
+                aDateTime.NanoSeconds = millisec * ::tools::Time::nanoPerMilli;
             }
             break;
         }