diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-29 17:43:42 +1100 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-31 04:31:13 +0000 |
commit | 3187193a6142b4b1c974ae1e1de572fa74a3c8ee (patch) | |
tree | 6d9350492186d06a38703821336ba79cb72a8583 /cppcanvas | |
parent | tdf#39468 idl: translate German warning (diff) | |
download | core-3187193a6142b4b1c974ae1e1de572fa74a3c8ee.tar.gz core-3187193a6142b4b1c974ae1e1de572fa74a3c8ee.zip |
tools: rename FontUnderline to FontLineStyle
Change-Id: I4750ad8569a1003b2f8c29052f3e25003ee433ca
Reviewed-on: https://gerrit.libreoffice.org/21892
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'cppcanvas')
-rw-r--r-- | cppcanvas/source/inc/outdevstate.hxx | 4 | ||||
-rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 2 | ||||
-rw-r--r-- | cppcanvas/source/mtfrenderer/mtftools.cxx | 76 |
3 files changed, 41 insertions, 41 deletions
diff --git a/cppcanvas/source/inc/outdevstate.hxx b/cppcanvas/source/inc/outdevstate.hxx index 63aa7fb5c597..2613440b0951 100644 --- a/cppcanvas/source/inc/outdevstate.hxx +++ b/cppcanvas/source/inc/outdevstate.hxx @@ -63,8 +63,8 @@ namespace cppcanvas textAlignment(0), // TODO(Q2): Synchronize with implrenderer // and possibly new rendering::TextAlignment textReliefStyle(RELIEF_NONE), - textOverlineStyle(UNDERLINE_NONE), - textUnderlineStyle(UNDERLINE_NONE), + textOverlineStyle(LINESTYLE_NONE), + textUnderlineStyle(LINESTYLE_NONE), textStrikeoutStyle(STRIKEOUT_NONE), textReferencePoint(ALIGN_BASELINE), diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 69a5d66f51ac..31cd771ceb44 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -1496,7 +1496,7 @@ namespace cppcanvas rState.textReliefStyle = (sal_Int8)rFont.GetRelief(); rState.textOverlineStyle = (sal_Int8)rFont.GetOverline(); rState.textUnderlineStyle = rParms.maFontUnderline.is_initialized() ? - (*rParms.maFontUnderline ? (sal_Int8)UNDERLINE_SINGLE : (sal_Int8)UNDERLINE_NONE) : + (*rParms.maFontUnderline ? (sal_Int8)LINESTYLE_SINGLE : (sal_Int8)LINESTYLE_NONE) : (sal_Int8)rFont.GetUnderline(); rState.textStrikeoutStyle = (sal_Int8)rFont.GetStrikeout(); rState.textEmphasisMarkStyle = (sal_Int8)rFont.GetEmphasisMark(); diff --git a/cppcanvas/source/mtfrenderer/mtftools.cxx b/cppcanvas/source/mtfrenderer/mtftools.cxx index b148e763e765..32c0af7c61ed 100644 --- a/cppcanvas/source/mtfrenderer/mtftools.cxx +++ b/cppcanvas/source/mtfrenderer/mtftools.cxx @@ -320,16 +320,16 @@ namespace cppcanvas switch( rTextLineInfo.mnOverlineStyle ) { - case UNDERLINE_NONE: // nothing to do + case LINESTYLE_NONE: // nothing to do // FALLTHROUGH intended - case UNDERLINE_DONTKNOW: + case LINESTYLE_DONTKNOW: break; - case UNDERLINE_SMALLWAVE: // TODO(F3): NYI + case LINESTYLE_SMALLWAVE: // TODO(F3): NYI // FALLTHROUGH intended - case UNDERLINE_WAVE: // TODO(F3): NYI + case LINESTYLE_WAVE: // TODO(F3): NYI // FALLTHROUGH intended - case UNDERLINE_SINGLE: + case LINESTYLE_SINGLE: appendRect( aTextLinesPolyPoly, rStartPos, @@ -339,19 +339,19 @@ namespace cppcanvas rTextLineInfo.mnOverlineOffset + rTextLineInfo.mnOverlineHeight ); break; - case UNDERLINE_BOLDDOTTED: // TODO(F3): NYI + case LINESTYLE_BOLDDOTTED: // TODO(F3): NYI // FALLTHROUGH intended - case UNDERLINE_BOLDDASH: // TODO(F3): NYI + case LINESTYLE_BOLDDASH: // TODO(F3): NYI // FALLTHROUGH intended - case UNDERLINE_BOLDLONGDASH: // TODO(F3): NYI + case LINESTYLE_BOLDLONGDASH: // TODO(F3): NYI // FALLTHROUGH intended - case UNDERLINE_BOLDDASHDOT: // TODO(F3): NYI + case LINESTYLE_BOLDDASHDOT: // TODO(F3): NYI // FALLTHROUGH intended - case UNDERLINE_BOLDDASHDOTDOT:// TODO(F3): NYI + case LINESTYLE_BOLDDASHDOTDOT:// TODO(F3): NYI // FALLTHROUGH intended - case UNDERLINE_BOLDWAVE: // TODO(F3): NYI + case LINESTYLE_BOLDWAVE: // TODO(F3): NYI // FALLTHROUGH intended - case UNDERLINE_BOLD: + case LINESTYLE_BOLD: appendRect( aTextLinesPolyPoly, rStartPos, @@ -361,9 +361,9 @@ namespace cppcanvas rTextLineInfo.mnOverlineOffset + rTextLineInfo.mnOverlineHeight ); break; - case UNDERLINE_DOUBLEWAVE: // TODO(F3): NYI + case LINESTYLE_DOUBLEWAVE: // TODO(F3): NYI // FALLTHROUGH intended - case UNDERLINE_DOUBLE: + case LINESTYLE_DOUBLE: appendRect( aTextLinesPolyPoly, rStartPos, @@ -381,9 +381,9 @@ namespace cppcanvas rTextLineInfo.mnOverlineOffset + rTextLineInfo.mnOverlineHeight * 2.0 ); break; - case UNDERLINE_DASHDOTDOT: // TODO(F3): NYI + case LINESTYLE_DASHDOTDOT: // TODO(F3): NYI // FALLTHROUGH intended - case UNDERLINE_DOTTED: + case LINESTYLE_DOTTED: appendDashes( aTextLinesPolyPoly, rStartPos.getX(), @@ -394,9 +394,9 @@ namespace cppcanvas 2*rTextLineInfo.mnOverlineHeight ); break; - case UNDERLINE_DASHDOT: // TODO(F3): NYI + case LINESTYLE_DASHDOT: // TODO(F3): NYI // FALLTHROUGH intended - case UNDERLINE_DASH: + case LINESTYLE_DASH: appendDashes( aTextLinesPolyPoly, rStartPos.getX(), @@ -407,7 +407,7 @@ namespace cppcanvas 6*rTextLineInfo.mnOverlineHeight ); break; - case UNDERLINE_LONGDASH: + case LINESTYLE_LONGDASH: appendDashes( aTextLinesPolyPoly, rStartPos.getX(), @@ -425,16 +425,16 @@ namespace cppcanvas switch( rTextLineInfo.mnUnderlineStyle ) { - case UNDERLINE_NONE: // nothing to do + case LINESTYLE_NONE: // nothing to do // FALLTHROUGH intended - case UNDERLINE_DONTKNOW: + case LINESTYLE_DONTKNOW: break; - case UNDERLINE_SMALLWAVE: // TODO(F3): NYI + case LINESTYLE_SMALLWAVE: // TODO(F3): NYI // FALLTHROUGH intended - case UNDERLINE_WAVE: // TODO(F3): NYI + case LINESTYLE_WAVE: // TODO(F3): NYI // FALLTHROUGH intended - case UNDERLINE_SINGLE: + case LINESTYLE_SINGLE: appendRect( aTextLinesPolyPoly, rStartPos, @@ -444,19 +444,19 @@ namespace cppcanvas rTextLineInfo.mnUnderlineOffset + rTextLineInfo.mnLineHeight ); break; - case UNDERLINE_BOLDDOTTED: // TODO(F3): NYI + case LINESTYLE_BOLDDOTTED: // TODO(F3): NYI // FALLTHROUGH intended - case UNDERLINE_BOLDDASH: // TODO(F3): NYI + case LINESTYLE_BOLDDASH: // TODO(F3): NYI // FALLTHROUGH intended - case UNDERLINE_BOLDLONGDASH: // TODO(F3): NYI + case LINESTYLE_BOLDLONGDASH: // TODO(F3): NYI // FALLTHROUGH intended - case UNDERLINE_BOLDDASHDOT: // TODO(F3): NYI + case LINESTYLE_BOLDDASHDOT: // TODO(F3): NYI // FALLTHROUGH intended - case UNDERLINE_BOLDDASHDOTDOT:// TODO(F3): NYI + case LINESTYLE_BOLDDASHDOTDOT:// TODO(F3): NYI // FALLTHROUGH intended - case UNDERLINE_BOLDWAVE: // TODO(F3): NYI + case LINESTYLE_BOLDWAVE: // TODO(F3): NYI // FALLTHROUGH intended - case UNDERLINE_BOLD: + case LINESTYLE_BOLD: appendRect( aTextLinesPolyPoly, rStartPos, @@ -466,9 +466,9 @@ namespace cppcanvas rTextLineInfo.mnUnderlineOffset + 2*rTextLineInfo.mnLineHeight ); break; - case UNDERLINE_DOUBLEWAVE: // TODO(F3): NYI + case LINESTYLE_DOUBLEWAVE: // TODO(F3): NYI // FALLTHROUGH intended - case UNDERLINE_DOUBLE: + case LINESTYLE_DOUBLE: appendRect( aTextLinesPolyPoly, rStartPos, @@ -486,9 +486,9 @@ namespace cppcanvas rTextLineInfo.mnUnderlineOffset + 3*rTextLineInfo.mnLineHeight ); break; - case UNDERLINE_DASHDOTDOT: // TODO(F3): NYI + case LINESTYLE_DASHDOTDOT: // TODO(F3): NYI // FALLTHROUGH intended - case UNDERLINE_DOTTED: + case LINESTYLE_DOTTED: appendDashes( aTextLinesPolyPoly, rStartPos.getX(), @@ -499,9 +499,9 @@ namespace cppcanvas 2*rTextLineInfo.mnLineHeight ); break; - case UNDERLINE_DASHDOT: // TODO(F3): NYI + case LINESTYLE_DASHDOT: // TODO(F3): NYI // FALLTHROUGH intended - case UNDERLINE_DASH: + case LINESTYLE_DASH: appendDashes( aTextLinesPolyPoly, rStartPos.getX(), @@ -512,7 +512,7 @@ namespace cppcanvas 6*rTextLineInfo.mnLineHeight ); break; - case UNDERLINE_LONGDASH: + case LINESTYLE_LONGDASH: appendDashes( aTextLinesPolyPoly, rStartPos.getX(), |