drawinglayer/source/tools/wmfemfhelper.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
New commits: commit 5b14a18f4748c7b09b432cfae5577c966213a80b Author: Armin Le Grand <[email protected]> AuthorDate: Wed Mar 25 17:40:20 2020 +0100 Commit: Armin Le Grand <[email protected]> CommitDate: Wed Mar 25 18:45:44 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 <[email protected]> diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx index b42124eddd38..80989a2edccf 100644 --- a/drawinglayer/source/tools/wmfemfhelper.cxx +++ b/drawinglayer/source/tools/wmfemfhelper.cxx @@ -2433,7 +2433,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) @@ -2445,7 +2446,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) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
