diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-10-22 18:25:35 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-10-23 00:18:55 +0200 |
| commit | 6d3843a415bb74a00a40f312b7771db27060cf0b (patch) | |
| tree | 38f2991232cc04f50ed23484885c42fee622f289 /svx | |
| parent | c816cb847da9a3302f23e113171c81fed6b319c0 (diff) | |
Implement IsUnderlineAbove in vcl::Font
There was even a duplicate implementation...
Change-Id: I192ac2ec8e5b8dd0e6b3ab9b9ddf0bf53df546ab
Reviewed-on: https://gerrit.libreoffice.org/62199
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdotextdecomposition.cxx | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index b98ee9e053ba..e5e0ee273e11 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -90,7 +90,6 @@ namespace DECL_LINK(decomposeBlockBulletPrimitive, DrawBulletInfo*, void); DECL_LINK(decomposeStretchBulletPrimitive, DrawBulletInfo*, void); - static bool impIsUnderlineAbove(const vcl::Font& rFont); void impCreateTextPortionPrimitive(const DrawPortionInfo& rInfo); static drawinglayer::primitive2d::BasePrimitive2D* impCheckFieldPrimitive(drawinglayer::primitive2d::BasePrimitive2D* pPrimitive, const DrawPortionInfo& rInfo); void impFlushTextPortionPrimitivesToLinePrimitives(); @@ -152,17 +151,6 @@ namespace drawinglayer::primitive2d::Primitive2DContainer const & getPrimitive2DSequence(); }; - bool impTextBreakupHandler::impIsUnderlineAbove(const vcl::Font& rFont) - { - if(!rFont.IsVertical()) - { - return false; - } - - // the underline is right for Japanese only - return (LANGUAGE_JAPANESE == rFont.GetLanguage()) || (LANGUAGE_JAPANESE == rFont.GetCJKContextLanguage()); - } - void impTextBreakupHandler::impCreateTextPortionPrimitive(const DrawPortionInfo& rInfo) { if(rInfo.maText.isEmpty() || !rInfo.mnTextLen) @@ -284,7 +272,7 @@ namespace // check UnderlineAbove const bool bUnderlineAbove( - drawinglayer::primitive2d::TEXT_LINE_NONE != eFontLineStyle && impIsUnderlineAbove(rInfo.mrFont)); + drawinglayer::primitive2d::TEXT_LINE_NONE != eFontLineStyle && rInfo.mrFont.IsUnderlineAbove()); // prepare strikeout data const drawinglayer::primitive2d::TextStrikeout eTextStrikeout( |