diff options
Diffstat (limited to 'drawinglayer/source/tools/emfppen.cxx')
-rw-r--r-- | drawinglayer/source/tools/emfppen.cxx | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/drawinglayer/source/tools/emfppen.cxx b/drawinglayer/source/tools/emfppen.cxx index a34cd2b5b5b4..d0fc763929fe 100644 --- a/drawinglayer/source/tools/emfppen.cxx +++ b/drawinglayer/source/tools/emfppen.cxx @@ -20,6 +20,7 @@ #include <com/sun/star/rendering/PathCapType.hpp> #include <com/sun/star/rendering/PathJoinType.hpp> #include <sal/log.hxx> + #include "emfppen.hxx" #include "emfpcustomlinecap.hxx" @@ -41,7 +42,7 @@ namespace emfplushelper PenDataDashedLineCap = 0x00000040, PenDataDashedLineOffset = 0x00000080, PenDataDashedLine = 0x00000100, - PenDataNonCenter = 0x00000200, + PenDataAlignment = 0x00000200, PenDataCompoundLine = 0x00000400, PenDataCustomStartCap = 0x00000800, PenDataCustomEndCap = 0x00001000 @@ -102,8 +103,8 @@ namespace emfplushelper if (flags & EmfPlusPenDataDashedLine) sFlags = sFlags.concat("\nEMF+\t\t\tEmfPlusPenDataDashedLine"); - if (flags & EmfPlusPenDataNonCenter) - sFlags = sFlags.concat("\nEMF+\t\t\tEmfPlusPenDataNonCenter"); + if (flags & EmfPlusPenDataAlignment) + sFlags = sFlags.concat("\nEMF+\t\t\tEmfPlusPenDataAlignment"); if (flags & EmfPlusPenDataCompoundLine) sFlags = sFlags.concat("\nEMF+\t\t\tEmfPlusPenDataCompoundLine"); @@ -159,6 +160,19 @@ namespace emfplushelper return ""; } + static OUString PenAlignmentToString(sal_uInt32 penalignment) + { + switch (penalignment) + { + case PenAlignmentCenter: return "PenAlignmentCenter"; + case PenAlignmentInset: return "PenAlignmentInset"; + case PenAlignmentLeft: return "PenAlignmentLeft"; + case PenAlignmentOutset: return "PenAlignmentOutset"; + case PenAlignmentRight: return "PenAlignmentRight"; + } + return ""; + } + /// Convert stroke caps between EMF+ and rendering API sal_Int8 EMFPPen::lcl_convertStrokeCap(sal_uInt32 nEmfStroke) { @@ -305,10 +319,10 @@ namespace emfplushelper } } - if (penDataFlags & PenDataNonCenter) + if (penDataFlags & PenDataAlignment) { s.ReadInt32(alignment); - SAL_WARN("drawinglayer", "EMF+\t\t TODO PenDataNonCenter: 0x" << std::hex << alignment); + SAL_WARN("drawinglayer", "EMF+\t\tTODO PenDataAlignment: " << PenAlignmentToString(alignment) << " (0x" << std::hex << alignment << ")"); } else { |