[Libreoffice-commits] core.git: include/vcl vcl/source

[Libreoffice Gerrit user]

 include/vcl/edit.hxx        |    2 +-
 vcl/source/control/edit.cxx |   15 ++-------------
 2 files changed, 3 insertions(+), 14 deletions(-)

New commits:
commit 4305d9a4b97a660fec54d2796f7e5cb502d4fba0
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Mon Jan 7 07:29:03 2019 -0500
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Jan 24 09:10:55 2019 +0100

    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 at collabora.com>

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 at 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());
             }
         }
     }