[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sc/source

[Jan Holesovsky (via logerrit)]

 sc/source/ui/app/inputwin.cxx |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

New commits:
commit 29ea62fbf5a2e8bebb9501ff7e969298dbfbc0a6
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Jan 17 18:02:05 2020 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Mon Jan 20 12:40:53 2020 +0100

    lok formula input: Don't show un-needed elements with the LOK active.
    
    Change-Id: I82effbdd48dab5b9de2cd05859e74e5c1027a4df
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86991
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 6bbbd9dcfe22..6591d121ea19 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -202,7 +202,10 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, const SfxBindings* pBind ) :
     InsertItem      (SID_INPUT_EQUAL,    Image(StockImage::Yes, RID_BMP_INPUT_EQUAL), ToolBoxItemBits::NONE, 4);
     InsertItem      (SID_INPUT_CANCEL,   Image(StockImage::Yes, RID_BMP_INPUT_CANCEL), ToolBoxItemBits::NONE, 5);
     InsertItem      (SID_INPUT_OK,       Image(StockImage::Yes, RID_BMP_INPUT_OK), ToolBoxItemBits::NONE, 6);
-    InsertSeparator (7);
+    if (!comphelper::LibreOfficeKit::isActive())
+    {
+        InsertSeparator (7);
+    }
     InsertWindow    (7, &aTextWindow, ToolBoxItemBits::NONE, 8);
 
     if (!comphelper::LibreOfficeKit::isActive())
@@ -464,14 +467,17 @@ void ScInputWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Recta
 
     ToolBox::Paint(rRenderContext, rRect);
 
-    // draw a line at the bottom to distinguish that from the grid
-    // (we have space for that thanks to ADDITIONAL_BORDER)
-    const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings();
-    rRenderContext.SetLineColor(rStyleSettings.GetShadowColor());
+    if (!comphelper::LibreOfficeKit::isActive())
+    {
+        // draw a line at the bottom to distinguish that from the grid
+        // (we have space for that thanks to ADDITIONAL_BORDER)
+        const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings();
+        rRenderContext.SetLineColor(rStyleSettings.GetShadowColor());
 
-    Size aSize = GetSizePixel();
-    rRenderContext.DrawLine(Point(0, aSize.Height() - 1),
-                            Point(aSize.Width() - 1, aSize.Height() - 1));
+        Size aSize = GetSizePixel();
+        rRenderContext.DrawLine(Point(0, aSize.Height() - 1),
+                                Point(aSize.Width() - 1, aSize.Height() - 1));
+    }
 }
 
 void ScInputWindow::PixelInvalidate(const tools::Rectangle* pRectangle)