[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - emfio/source

[Andras Timar (via logerrit)]

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

New commits:
commit 5d3eaa832a79695bcf122918997b32f4d3881500
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Jan 20 15:46:24 2020 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Sep 21 15:28:24 2020 +0200

    fix constants according to [MS-EMF] 2.1.10
    
    (cherry picked from commit 971c4135b3a11cd74a13ac0eb4e3aaae4e7dfefd)
    
    Change-Id: I048eb097e9570f2ad2fecef5e725c98e36e6559e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103100
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx
index e59b7eaa5adc..133b6ccf7f83 100644
--- a/emfio/source/reader/emfreader.cxx
+++ b/emfio/source/reader/emfreader.cxx
@@ -389,8 +389,8 @@ namespace emfio
 
     const sal_uInt32 EMR_COMMENT_BEGINGROUP = 0x00000002;
     const sal_uInt32 EMR_COMMENT_ENDGROUP = 0x00000003;
-    const sal_uInt32 EMR_COMMENT_MULTIFORMATS = 0x00000004;
-    const sal_uInt32 EMR_COMMENT_WINDOWS_METAFILE = 0x00000005;
+    const sal_uInt32 EMR_COMMENT_MULTIFORMATS = 0x40000004;
+    const sal_uInt32 EMR_COMMENT_WINDOWS_METAFILE = 0x80000001;
 
     void EmfReader::ReadGDIComment(sal_uInt32 nCommentId)
     {