From b838a1ae614d8a76ba8a01c18e5dc47fb943ae40 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Fri, 17 Jan 2020 18:02:05 +0100 Subject: 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 Reviewed-by: Jan Holesovsky Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87063 Tested-by: Jenkins --- sc/source/ui/app/inputwin.cxx | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index a13797776f0c..0776958e5df8 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -195,7 +195,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); SetDropdownClickHdl( LINK( this, ScInputWindow, DropdownClickHdl )); @@ -423,12 +426,15 @@ 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 - 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)); + if (!comphelper::LibreOfficeKit::isActive()) + { + // draw a line at the bottom to distinguish that from the grid + 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)); + } } void ScInputWindow::PixelInvalidate(const tools::Rectangle* pRectangle) -- cgit v1.2.3