From 494e6a082c0186d7e54bc718439f79ed29471614 Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Tue, 10 Dec 2019 11:37:06 +1100 Subject: drawinglayer: improve logging - LineJoinTypeToString() Change-Id: Ib6ae6350fe61b3c0d787ad19ff55baa6487d63da Reviewed-on: https://gerrit.libreoffice.org/84835 Tested-by: Jenkins Reviewed-by: Bartosz Kosiorek --- drawinglayer/source/tools/emfppen.cxx | 14 +++++++++++++- drawinglayer/source/tools/emfppen.hxx | 8 ++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) (limited to 'drawinglayer') diff --git a/drawinglayer/source/tools/emfppen.cxx b/drawinglayer/source/tools/emfppen.cxx index 14d1951c9fa9..dc78d1140e5e 100644 --- a/drawinglayer/source/tools/emfppen.cxx +++ b/drawinglayer/source/tools/emfppen.cxx @@ -136,6 +136,18 @@ namespace emfplushelper return ""; } + static OUString LineJoinTypeToString(sal_uInt32 jointype) + { + switch (jointype) + { + case LineJoinTypeMiter: return "LineJoinTypeMiter"; + case LineJoinTypeBevel: return "LineJoinTypeBevel"; + case LineJoinTypeRound: return "LineJoinTypeRound"; + case LineJoinTypeMiterClipped: return "LineJoinTypeMiterClipped"; + } + return ""; + } + /// Convert stroke caps between EMF+ and rendering API sal_Int8 EMFPPen::lcl_convertStrokeCap(sal_uInt32 nEmfStroke) { @@ -213,7 +225,7 @@ namespace emfplushelper if (penDataFlags & PenDataJoin) { s.ReadInt32(lineJoin); - SAL_WARN("drawinglayer", "EMF+\t\t TODO PenDataJoin: 0x" << std::hex << lineJoin); + SAL_WARN("drawinglayer", "EMF+\t\tTODO PenDataJoin: " << LineJoinTypeToString(lineJoin) << " (0x" << std::hex << lineJoin << ")"); } else { diff --git a/drawinglayer/source/tools/emfppen.hxx b/drawinglayer/source/tools/emfppen.hxx index 7f255fd7b172..6a528ecc8ced 100644 --- a/drawinglayer/source/tools/emfppen.hxx +++ b/drawinglayer/source/tools/emfppen.hxx @@ -69,6 +69,14 @@ namespace emfplushelper LineCapTypeCustom = 0x000000FF }; + enum LineJoinType + { + LineJoinTypeMiter = 0x00000000, + LineJoinTypeBevel = 0x00000001, + LineJoinTypeRound = 0x00000002, + LineJoinTypeMiterClipped = 0x00000003 + }; + struct EMFPCustomLineCap; struct EMFPPen : public EMFPBrush -- cgit