desktop/qa/desktop_lib/test_desktop_lib.cxx | 2 +- drawinglayer/source/tools/emfppen.cxx | 13 ++++++++++++- drawinglayer/source/tools/emfppen.hxx | 7 +++++++ 3 files changed, 20 insertions(+), 2 deletions(-)
New commits: commit 7be16ddb57720a2a5bfb04c3496723dc6f462cc0 Author: Chris Sherlock <[email protected]> AuthorDate: Tue Dec 10 11:53:26 2019 +1100 Commit: Bartosz Kosiorek <[email protected]> CommitDate: Mon Dec 23 12:28:18 2019 +0100 drawinglayer: improve logging - DashedLineCapTypeToString() Change-Id: I9d7250980b833b8f45bef337c83b3592ca52ae3c Reviewed-on: https://gerrit.libreoffice.org/84837 Tested-by: Jenkins Reviewed-by: Bartosz Kosiorek <[email protected]> diff --git a/drawinglayer/source/tools/emfppen.cxx b/drawinglayer/source/tools/emfppen.cxx index dc78d1140e5e..a34cd2b5b5b4 100644 --- a/drawinglayer/source/tools/emfppen.cxx +++ b/drawinglayer/source/tools/emfppen.cxx @@ -148,6 +148,17 @@ namespace emfplushelper return ""; } + static OUString DashedLineCapTypeToString(sal_uInt32 dashedlinecaptype) + { + switch (dashedlinecaptype) + { + case DashedLineCapTypeFlat: return "DashedLineCapTypeFlat"; + case DashedLineCapTypeRound: return "DashedLineCapTypeRound"; + case DashedLineCapTypeTriangle: return "DashedLineCapTypeTriangle"; + } + return ""; + } + /// Convert stroke caps between EMF+ and rendering API sal_Int8 EMFPPen::lcl_convertStrokeCap(sal_uInt32 nEmfStroke) { @@ -245,7 +256,7 @@ namespace emfplushelper if (penDataFlags & PenDataLineStyle) { s.ReadInt32(dashStyle); - SAL_INFO("drawinglayer", "EMF+\t\tdashStyle: 0x" << std::hex << dashStyle); + SAL_INFO("drawinglayer", "EMF+\t\tdashStyle: " << DashedLineCapTypeToString(dashStyle) << " (0x" << std::hex << dashStyle << ")"); } else { diff --git a/drawinglayer/source/tools/emfppen.hxx b/drawinglayer/source/tools/emfppen.hxx index 6a528ecc8ced..16884cb1ca54 100644 --- a/drawinglayer/source/tools/emfppen.hxx +++ b/drawinglayer/source/tools/emfppen.hxx @@ -77,6 +77,13 @@ namespace emfplushelper LineJoinTypeMiterClipped = 0x00000003 }; + enum DashedLineCapType + { + DashedLineCapTypeFlat = 0x00000000, + DashedLineCapTypeRound = 0x00000002, + DashedLineCapTypeTriangle = 0x00000003 + }; + struct EMFPCustomLineCap; struct EMFPPen : public EMFPBrush commit f2e51130db3b2d49d7964f3a3617dad267dba5ac Author: Andrea Gelmini <[email protected]> AuthorDate: Mon Dec 23 09:59:55 2019 +0100 Commit: Julien Nabet <[email protected]> CommitDate: Mon Dec 23 12:28:15 2019 +0100 Fix typo Change-Id: Ib375009bd87b458a71ead8438a40f7c1e32c1234 Reviewed-on: https://gerrit.libreoffice.org/85738 Reviewed-by: Julien Nabet <[email protected]> Tested-by: Julien Nabet <[email protected]> diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index e04ad53559aa..48e1411aa3d1 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -940,7 +940,7 @@ void DesktopLOKTest::testTrackChanges() pDocument->pClass->registerCallback(pDocument, &DesktopLOKTest::callback, this); Scheduler::ProcessEventsToIdle(); - // Enable trak changes and assert that both views get notified. + // Enable track changes and assert that both views get notified. m_nTrackChanges = 0; pDocument->pClass->postUnoCommand(pDocument, ".uno:TrackChanges", nullptr, false); Scheduler::ProcessEventsToIdle(); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
