[Libreoffice-commits] core.git: sc/source

[Szymon KÅ‚os (via logerrit)]

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

New commits:
commit ce30c3100ebbf49ccca128604883e614364fb124
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Nov 12 11:13:43 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed Jan 6 11:48:32 2021 +0100

    Hide calc input bar tooltips in online
    
    Change-Id: I07b364d55a3578161087eef281e313d5efae3ba7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105632
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108797
    Tested-by: Jenkins
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 14db809907b5..04c4e0e0f970 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -213,17 +213,18 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, const SfxBindings* pBind ) :
     // sigma and equal buttons
     if (!bIsLOKMobilePhone)
     {
-        SetItemText (SID_INPUT_SUM, ScResId( SCSTR_QHELP_BTNSUM ) );
         SetHelpId   (SID_INPUT_SUM, HID_INSWIN_SUMME);
-
-        SetItemText (SID_INPUT_EQUAL, ScResId( SCSTR_QHELP_BTNEQUAL ) );
         SetHelpId   (SID_INPUT_EQUAL, HID_INSWIN_FUNC);
+        SetHelpId   (SID_INPUT_CANCEL, HID_INSWIN_CANCEL);
+        SetHelpId   (SID_INPUT_OK, HID_INSWIN_OK);
 
-        SetItemText ( SID_INPUT_CANCEL, ScResId( SCSTR_QHELP_BTNCANCEL ) );
-        SetHelpId   ( SID_INPUT_CANCEL, HID_INSWIN_CANCEL );
-
-        SetItemText ( SID_INPUT_OK, ScResId( SCSTR_QHELP_BTNOK ) );
-        SetHelpId   ( SID_INPUT_OK, HID_INSWIN_OK );
+        if (!comphelper::LibreOfficeKit::isActive())
+        {
+            SetItemText ( SID_INPUT_SUM, ScResId( SCSTR_QHELP_BTNSUM ) );
+            SetItemText ( SID_INPUT_EQUAL, ScResId( SCSTR_QHELP_BTNEQUAL ) );
+            SetItemText ( SID_INPUT_CANCEL, ScResId( SCSTR_QHELP_BTNCANCEL ) );
+            SetItemText ( SID_INPUT_OK, ScResId( SCSTR_QHELP_BTNOK ) );
+        }
 
         EnableItem( SID_INPUT_CANCEL, false );
         EnableItem( SID_INPUT_OK, false );
@@ -880,8 +881,11 @@ ScInputBarGroup::ScInputBarGroup(vcl::Window* pParent, ScTabViewShell* pViewSh)
     mxButtonUp->connect_clicked(LINK(this, ScInputBarGroup, ClickHdl));
     mxButtonDown->connect_clicked(LINK(this, ScInputBarGroup, ClickHdl));
 
-    mxButtonUp->set_tooltip_text(ScResId( SCSTR_QHELP_COLLAPSE_FORMULA));
-    mxButtonDown->set_tooltip_text(ScResId(SCSTR_QHELP_EXPAND_FORMULA));
+    if (!comphelper::LibreOfficeKit::isActive())
+    {
+        mxButtonUp->set_tooltip_text(ScResId( SCSTR_QHELP_COLLAPSE_FORMULA));
+        mxButtonDown->set_tooltip_text(ScResId(SCSTR_QHELP_EXPAND_FORMULA));
+    }
 
     int nHeight = mxTextWndGroup->GetPixelHeightForLines(1);
     mxButtonUp->set_size_request(-1, nHeight);