[Libreoffice-commits] core.git: emfio/source

[Libreoffice Gerrit user]

 emfio/source/reader/emfreader.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 18bef257d1cc3c1323f2f5561d6c897d26756193
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Mar 4 21:50:35 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Mar 5 08:47:29 2019 +0100

    Assume that EMR_SETVIEWPORTEXTEX wants to read signed values
    
    ...similar to 095e1ca4372d90da7fc56051f1271ddd975a9e3a "Assume that
    EMR_SETWINDOWEXTEX wants to read signed values", this time causing "implicit
    conversion from type 'long' of value 4294967200 (64-bit, signed) to type
    'sal_Int32' (aka 'int') changed the value to -96 (32-bit, signed)" in
    emfio::MtfTools::SetDevExt (emfio/source/reader/mtftools.cxx) during
    CppunitTest_sw_rtfexport2.
    
    Change-Id: I114cc883fd3ac78291df8190b8528384966b563f
    Reviewed-on: https://gerrit.libreoffice.org/68709
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx
index af082ea64fcd..b54698d3b877 100644
--- a/emfio/source/reader/emfreader.cxx
+++ b/emfio/source/reader/emfreader.cxx
@@ -792,8 +792,9 @@ namespace emfio
 
                     case EMR_SETVIEWPORTEXTEX :
                     {
-                        mpInputStream->ReadUInt32( nW ).ReadUInt32( nH );
-                        SetDevExt( Size( nW, nH ) );
+                        sal_Int32 w = 0, h = 0;
+                        mpInputStream->ReadInt32( w ).ReadInt32( h );
+                        SetDevExt( Size( w, h ) );
                     }
                     break;