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 9c5bc82fdfa67d0149806a0b55962edc7925dd0f.

2 files changed, 3 insertions, 14 deletions

diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 45006a407414..9588da8b6fe6 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -111,7 +111,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, long nXStart, long nXEnd);
+    SAL_DLLPRIVATE void        ImplPaintBorder(vcl::RenderContext const & rRenderContext, long nXStart, long nXEnd);
     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 38797d68c783..7560860de9de 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -57,7 +57,6 @@
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
-#include <comphelper/lok.hxx>
 
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
@@ -1001,7 +1000,7 @@ void Edit::ImplClearBackground(vcl::RenderContext& rRenderContext, const tools::
     }
 }
 
-void Edit::ImplPaintBorder(vcl::RenderContext& rRenderContext, long nXStart, long nXEnd)
+void Edit::ImplPaintBorder(vcl::RenderContext const & rRenderContext, long nXStart, long nXEnd)
 {
     // this is not needed when double-buffering
     if (SupportsDoubleBuffering())
@@ -1063,17 +1062,7 @@ void Edit::ImplPaintBorder(vcl::RenderContext& rRenderContext, long nXStart, lon
             }
             else
             {
-                // For some mysterious reaon, 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());
             }
         }
     }