diff options
| -rw-r--r-- | include/vcl/edit.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/control/edit.cxx | 15 |
2 files changed, 3 insertions, 14 deletions
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index a44a43062b0f..caf759789bef 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -117,7 +117,7 @@ private: SAL_DLLPRIVATE void ImplInsertText( const OUString& rStr, const Selection* pNewSelection = nullptr, bool bIsUserInput = false ); SAL_DLLPRIVATE static OUString ImplGetValidString( const OUString& rString ); SAL_DLLPRIVATE void ImplClearBackground(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRectangle, long nXStart, long nXEnd); - SAL_DLLPRIVATE void ImplPaintBorder(vcl::RenderContext& rRenderContext); + SAL_DLLPRIVATE void ImplPaintBorder(vcl::RenderContext const & rRenderContext); SAL_DLLPRIVATE void ImplShowCursor( bool bOnlyIfVisible = true ); SAL_DLLPRIVATE void ImplAlign(); SAL_DLLPRIVATE void ImplAlignAndPaint(); 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()); } } } |