From d2aee5ab5a89efc8e5e42eb124afb80be637f379 Mon Sep 17 00:00:00 2001 From: Mark Hung Date: Sat, 20 Oct 2018 08:49:57 +0800 Subject: tdf#70851 render wave underlines in slideshow. Change-Id: I31b2717e60b5eae6c992e27700e589938764957c Reviewed-on: https://gerrit.libreoffice.org/62035 Tested-by: Jenkins Reviewed-by: Mark Hung --- cppcanvas/source/mtfrenderer/mtftools.cxx | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'cppcanvas/source/mtfrenderer') diff --git a/cppcanvas/source/mtfrenderer/mtftools.cxx b/cppcanvas/source/mtfrenderer/mtftools.cxx index 1e1221897598..75c7d6069146 100644 --- a/cppcanvas/source/mtfrenderer/mtftools.cxx +++ b/cppcanvas/source/mtfrenderer/mtftools.cxx @@ -473,10 +473,21 @@ namespace cppcanvas case LINESTYLE_DONTKNOW: break; - case LINESTYLE_SMALLWAVE: // TODO(F3): NYI + case LINESTYLE_DOUBLEWAVE: + // FALLTHROUGH intended + case LINESTYLE_SMALLWAVE: // FALLTHROUGH intended - case LINESTYLE_WAVE: // TODO(F3): NYI + case LINESTYLE_BOLDWAVE: // FALLTHROUGH intended + case LINESTYLE_WAVE: + appendWaveline( + aTextLinesPolyPoly, + rStartPos, + rTextLineInfo.mnUnderlineOffset, + rLineWidth, + rTextLineInfo.mnLineHeight, + rTextLineInfo.mnUnderlineStyle); + break; case LINESTYLE_SINGLE: appendRect( aTextLinesPolyPoly, @@ -497,8 +508,6 @@ namespace cppcanvas // FALLTHROUGH intended case LINESTYLE_BOLDDASHDOTDOT:// TODO(F3): NYI // FALLTHROUGH intended - case LINESTYLE_BOLDWAVE: // TODO(F3): NYI - // FALLTHROUGH intended case LINESTYLE_BOLD: appendRect( aTextLinesPolyPoly, @@ -509,8 +518,6 @@ namespace cppcanvas rTextLineInfo.mnUnderlineOffset + 2*rTextLineInfo.mnLineHeight ); break; - case LINESTYLE_DOUBLEWAVE: // TODO(F3): NYI - // FALLTHROUGH intended case LINESTYLE_DOUBLE: appendRect( aTextLinesPolyPoly, -- cgit v1.2.3