diff options
| -rw-r--r-- | compilerplugins/clang/unusedenumconstants.readonly.results | 4 | ||||
| -rw-r--r-- | include/svtools/ruler.hxx | 4 | ||||
| -rw-r--r-- | svtools/source/control/ruler.cxx | 17 |
3 files changed, 6 insertions, 19 deletions
diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results b/compilerplugins/clang/unusedenumconstants.readonly.results index 090a2720967a..e450cd2a73a2 100644 --- a/compilerplugins/clang/unusedenumconstants.readonly.results +++ b/compilerplugins/clang/unusedenumconstants.readonly.results @@ -486,10 +486,6 @@ include/svtools/ivctrl.hxx:45 enum SvxIconViewFlags DROP_TARGET include/svtools/ivctrl.hxx:46 enum SvxIconViewFlags BLOCK_EMPHASIS -include/svtools/ruler.hxx:506 - enum RulerBorderStyle Snap -include/svtools/ruler.hxx:507 - enum RulerBorderStyle Margin include/svtools/table/tablemodel.hxx:48 enum ColumnAttributeGroup ALL include/svx/EnhancedCustomShapeGeometry.hxx:46 diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 5a7c463aa3b5..26183807d4f8 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -503,12 +503,10 @@ enum class RulerBorderStyle { Moveable = 0x0002, Variable = 0x0004, Table = 0x0008, - Snap = 0x0010, - Margin = 0x0020, Invisible = 0x0040 }; namespace o3tl { - template<> struct typed_flags<RulerBorderStyle> : is_typed_flags<RulerBorderStyle, 0x007f> {}; + template<> struct typed_flags<RulerBorderStyle> : is_typed_flags<RulerBorderStyle, 0x004f> {}; } struct RulerBorder diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index fefc971c1077..7baf7ffd1c86 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -725,18 +725,11 @@ void Ruler::ImplDrawBorders(vcl::RenderContext& rRenderContext, long nMin, long n = n1 + ((n2 - n1) / 2); rRenderContext.SetLineColor(rStyleSettings.GetShadowColor()); - if (mpData->pBorders[i].nStyle & RulerBorderStyle::Snap) - ImplVDrawLine(rRenderContext, n, nVirTop, n, nVirBottom); - else if (mpData->pBorders[i].nStyle & RulerBorderStyle::Margin) - ImplVDrawLine(rRenderContext, n, nVirTop, n, nVirBottom); - else - { - ImplVDrawLine(rRenderContext, n - 1, nVirTop, n - 1, nVirBottom); - ImplVDrawLine(rRenderContext, n + 1, nVirTop, n + 1, nVirBottom); - rRenderContext.SetLineColor(); - rRenderContext.SetFillColor(rStyleSettings.GetWindowColor()); - ImplVDrawRect(rRenderContext, n, nVirTop, n, nVirBottom); - } + ImplVDrawLine(rRenderContext, n - 1, nVirTop, n - 1, nVirBottom); + ImplVDrawLine(rRenderContext, n + 1, nVirTop, n + 1, nVirBottom); + rRenderContext.SetLineColor(); + rRenderContext.SetFillColor(rStyleSettings.GetWindowColor()); + ImplVDrawRect(rRenderContext, n, nVirTop, n, nVirBottom); } } } |