diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-14 14:21:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-14 14:22:24 +0200 |
| commit | 2074acd6e3793e38aa6bbf9b9c8e2ba116341e32 (patch) | |
| tree | f47ffc1fcbf0c9e12bcb805d418bca5b9ceb7158 /svtools | |
| parent | convert SvParserState to scoped enum (diff) | |
| download | core-2074acd6e3793e38aa6bbf9b9c8e2ba116341e32.tar.gz core-2074acd6e3793e38aa6bbf9b9c8e2ba116341e32.zip | |
remove unused Border from RulerIndentStyle enum
Change-Id: If8d5acdf48278adeb4974c46c8e777e8792ba743
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/control/ruler.cxx | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 874caa55e499..aaaca43a0e54 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -811,13 +811,7 @@ void Ruler::ImplDrawIndents(vcl::RenderContext& rRenderContext, long nMin, long if ((n >= nMin) && (n <= nMax)) { - if (nIndentStyle == RulerIndentStyle::Border) - { - const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings(); - rRenderContext.SetLineColor(rStyleSettings.GetShadowColor()); - ImplVDrawLine(rRenderContext, n, nVirTop + 1, n, nVirBottom - 1); - } - else if (nIndentStyle == RulerIndentStyle::Bottom) + if (nIndentStyle == RulerIndentStyle::Bottom) { aPoly.SetPoint(Point(n + 0, nVirBottom - nIndentHeight), 0); aPoly.SetPoint(Point(n - nIndentWidth2, nVirBottom - 3), 1); @@ -844,19 +838,16 @@ void Ruler::ImplDrawIndents(vcl::RenderContext& rRenderContext, long nMin, long aPoly[i] = aSet; } } - if (RulerIndentStyle::Border != nIndentStyle) + bool bIsHit = false; + if(mxCurrentHitTest.get() != nullptr && mxCurrentHitTest->eType == RulerType::Indent) { - bool bIsHit = false; - if(mxCurrentHitTest.get() != nullptr && mxCurrentHitTest->eType == RulerType::Indent) - { - bIsHit = mxCurrentHitTest->nAryPos == j; - } - else if(mbDrag && meDragType == RulerType::Indent) - { - bIsHit = mnDragAryPos == j; - } - ImplDrawIndent(rRenderContext, aPoly, bIsHit); + bIsHit = mxCurrentHitTest->nAryPos == j; + } + else if(mbDrag && meDragType == RulerType::Indent) + { + bIsHit = mnDragAryPos == j; } + ImplDrawIndent(rRenderContext, aPoly, bIsHit); } } } |