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

[Armin Le Grand (via logerrit)]

 drawinglayer/source/tools/wmfemfhelper.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 4f8325dbcb63627997289889a377a4893e03fcf1
Author:     Armin Le Grand <Armin.Le.Grand at me.com>
AuthorDate: Wed Mar 25 17:40:20 2020 +0100
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Fri Mar 27 12:35:28 2020 +0100

    tdf#89901 corectly interpret COL_TRANSPARENT
    
    in wmfemfhelper when converting Metafile to
    sequence of Prmitives. In the MetafileActions
    MetaLineColorAction and MetaFillColorAction
    usage of COL_TRANSPARENT must switch off line
    draw/resp. fill
    
    Change-Id: Id5754773c06b7f4aa8824dce9b8b9e7e526e6067
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91061
    Tested-by: Jenkins
    Reviewed-by: Armin Le Grand <Armin.Le.Grand at me.com>
    (cherry picked from commit 5b14a18f4748c7b09b432cfae5577c966213a80b)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91171
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx
index 88755d2e9d2e..2b3ac3238c1d 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -2432,7 +2432,8 @@ namespace wmfemfhelper
                 {
                     /** CHECKED, WORKS WELL */
                     const MetaLineColorAction* pA = static_cast<const MetaLineColorAction*>(pAction);
-                    const bool bActive(pA->IsSetting());
+                    // tdf#89901 do as OutDev does: COL_TRANSPARENT deacvtivates line draw
+                    const bool bActive(pA->IsSetting() && COL_TRANSPARENT != pA->GetColor());
 
                     rPropertyHolders.Current().setLineColorActive(bActive);
                     if(bActive)
@@ -2444,7 +2445,8 @@ namespace wmfemfhelper
                 {
                     /** CHECKED, WORKS WELL */
                     const MetaFillColorAction* pA = static_cast<const MetaFillColorAction*>(pAction);
-                    const bool bActive(pA->IsSetting());
+                    // tdf#89901 do as OutDev does: COL_TRANSPARENT deacvtivates polygon fill
+                    const bool bActive(pA->IsSetting() && COL_TRANSPARENT != pA->GetColor());
 
                     rPropertyHolders.Current().setFillColorActive(bActive);
                     if(bActive)