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

[Szymon KÅ‚os (via logerrit)]

 sc/source/ui/app/inputwin.cxx |   26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

New commits:
commit 86fde5f98480c7f4f485b4426c1d412243fbf874
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Nov 12 11:13:43 2020 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sun Nov 15 17:29:24 2020 +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>

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 2e7ec7eb8c43..ea903dd531f7 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -225,17 +225,18 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, const SfxBindings* pBind ) :
     // sigma and euqal buttons
     if (!mpViewShell->isLOKMobilePhone())
     {
-        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 );
@@ -830,7 +831,8 @@ ScInputBarGroup::ScInputBarGroup(vcl::Window* pParent, ScTabViewShell* pViewSh)
     maButton->SetSizePixel(aSize);
     maButton->Enable();
     maButton->SetSymbol(SymbolType::SPIN_DOWN);
-    maButton->SetQuickHelpText(ScResId(SCSTR_QHELP_EXPAND_FORMULA));
+    if (!comphelper::LibreOfficeKit::isActive())
+        maButton->SetQuickHelpText(ScResId(SCSTR_QHELP_EXPAND_FORMULA));
     // disable the multiline toggle on the mobile phones
     const SfxViewShell* pViewShell = SfxViewShell::Current();
     if (!comphelper::LibreOfficeKit::isActive() || !(pViewShell && pViewShell->isLOKMobilePhone()))
@@ -894,12 +896,14 @@ void ScInputBarGroup::Resize()
     if (maTextWndGroup->GetNumLines() > 1)
     {
         maButton->SetSymbol( SymbolType::SPIN_UP  );
-        maButton->SetQuickHelpText(ScResId( SCSTR_QHELP_COLLAPSE_FORMULA));
+        if (!comphelper::LibreOfficeKit::isActive())
+            maButton->SetQuickHelpText(ScResId( SCSTR_QHELP_COLLAPSE_FORMULA));
     }
     else
     {
         maButton->SetSymbol( SymbolType::SPIN_DOWN  );
-        maButton->SetQuickHelpText(ScResId( SCSTR_QHELP_EXPAND_FORMULA));
+        if (!comphelper::LibreOfficeKit::isActive())
+            maButton->SetQuickHelpText(ScResId( SCSTR_QHELP_EXPAND_FORMULA));
     }
 
     maButton->SetPosPixel(Point(aSize.Width(), 0));