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

[Xisco Fauli (via logerrit)]

 drawinglayer/source/tools/emfphelperdata.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2cdab992c6faeb98a1cbef7615f4cc7ce0d3f04d
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Mon Feb 17 18:06:20 2020 +0100
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Feb 17 20:31:07 2020 +0100

    tdf#129675: This should be EmfPlusPenDataDashedLine
    
    else if (pen->penDataFlags & 0x00000100)
    was changed to
    else if (pen->penDataFlags & EmfPlusPenDataMiterLimit)
    where EmfPlusPenDataMiterLimit = 0x00000010
    
    See https://bugs.documentfoundation.org/show_bug.cgi?id=129675#c20
    
    Regression from 1bd303a4c38a1bc04c3cf7bf0e7a44ac0fdb209d
    
    Change-Id: I01ba4272aaa665a2fb0ab7ce9c05bb882db77d3e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88878
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx
index 9aba863f318b..936afec29364 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -544,7 +544,7 @@ namespace emfplushelper
                         break;
                 }
             }
-            else if (pen->penDataFlags & EmfPlusPenDataMiterLimit) // pen has a custom dash line
+            else if (pen->penDataFlags & EmfPlusPenDataDashedLine) // pen has a custom dash line
             {
                 // StrokeAttribute needs a double vector while the pen provides a float vector
                 std::vector<double> aPattern(pen->dashPattern.size());