diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2019-01-07 07:29:03 -0500 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2019-01-24 09:10:55 +0100 |
| commit | 4305d9a4b97a660fec54d2796f7e5cb502d4fba0 (patch) | |
| tree | 91cc0e99a7ff175e7d19a4cc727204db572480a6 /vcl/source | |
| parent | bd1aeecf0bbca1ce0282a98d7c0da144295bc146 (diff) | |
Revert "lok: custom widgets: render editbox borders"
Looks like this is no longer needed to correctly render
editbox borders. Not clear what fixed the issue.
This reverts commit 7484f1691cbe9513dabf084effe8a0366b737a80.
Change-Id: Ieb3b8d6f60ab762d0baccb341ed6a39ae2771e79
Reviewed-on: https://gerrit.libreoffice.org/66774
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/control/edit.cxx | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 12b9b8943d8e..f15daa864ede 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -55,7 +55,6 @@ #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> -#include <comphelper/lok.hxx> #include <sot/exchange.hxx> #include <sot/formats.hxx> @@ -987,7 +986,7 @@ void Edit::ImplClearBackground(vcl::RenderContext& rRenderContext, const tools:: } } -void Edit::ImplPaintBorder(vcl::RenderContext& rRenderContext) +void Edit::ImplPaintBorder(vcl::RenderContext const & rRenderContext) { // this is not needed when double-buffering if (SupportsDoubleBuffering()) @@ -1044,17 +1043,7 @@ void Edit::ImplPaintBorder(vcl::RenderContext& rRenderContext) } else { - // For some mysterious reason, in headless/svp rendering, - // pBorder has bad clipping region (shows as 1x1@0,0), - // and therefore doesn't render anything at all. - // In the case that we know we're in headless/svp, we - // render directly on the current context (the edit control). - // But if we (the editbox) are part of a more complex control - // (e.g. spinbox), we render not (i.e. we let pBorder pretend). - if (!mbIsSubEdit && comphelper::LibreOfficeKit::isActive()) - pBorder->Paint(rRenderContext, tools::Rectangle()); - else - pBorder->Paint(*pBorder, tools::Rectangle()); + pBorder->Paint(*pBorder, tools::Rectangle()); } } } |