sc/source/ui/app/inputwin.cxx | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
New commits:
commit 4a9ef85e6522ba7b6ef02f97572094eb29c70bd5
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Fri Jan 17 18:02:05 2020 +0100
Commit: Jan Holesovsky <ke...@collabora.com>
CommitDate: Mon Feb 3 12:25:47 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 <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87063
Tested-by: Jenkins
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 8ea768eca7e1..2017ca88959f 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -191,7 +191,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 ));
@@ -398,12 +401,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::Resize()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
