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

[Szymon KÅ‚os (via logerrit)]

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

New commits:
commit 6764475689d26d846a228cccc1e641cc4238e63e
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Oct 27 10:41:47 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Oct 27 14:08:13 2020 +0100

    Don't show tooltip for formula bar in online
    
    Change-Id: Ib7608bb31222234ea08c99e76dcd341570d3685b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104861
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    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 593ae2d4d900..2e7ec7eb8c43 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -213,12 +213,10 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, const SfxBindings* pBind ) :
     {
         aWndPos   ->SetQuickHelpText(ScResId(SCSTR_QHELP_POSWND));
         aWndPos   ->SetHelpId       (HID_INSWIN_POS);
-    }
-    aTextWindow.SetQuickHelpText(ScResId(SCSTR_QHELP_INPUTWND));
-    aTextWindow.SetHelpId       (HID_INSWIN_INPUT);
 
-    if (!comphelper::LibreOfficeKit::isActive())
-    {
+        aTextWindow.SetQuickHelpText(ScResId(SCSTR_QHELP_INPUTWND));
+        aTextWindow.SetHelpId       (HID_INSWIN_INPUT);
+
         // No SetHelpText: the helptexts come from the Help
         SetItemText (SID_INPUT_FUNCTION, ScResId(SCSTR_QHELP_BTNCALC));
         SetHelpId   (SID_INPUT_FUNCTION, HID_INSWIN_CALC);
@@ -1128,7 +1126,8 @@ ScTextWndGroup::ScTextWndGroup(vcl::Window* pParent, ScTabViewShell* pViewSh)
     Size aSize = GetSizePixel();
     maTextWnd->SetSizePixel(Size(aSize.Width() - 4 * gnBorderWidth, aSize.Height() - 2 * gnBorderHeight));
     maTextWnd->Show();
-    maTextWnd->SetQuickHelpText(ScResId(SCSTR_QHELP_INPUTWND));
+    if (!comphelper::LibreOfficeKit::isActive())
+        maTextWnd->SetQuickHelpText(ScResId(SCSTR_QHELP_INPUTWND));
     maTextWnd->SetHelpId(HID_INSWIN_INPUT);
     maScrollBar->SetScrollHdl(LINK(this, ScTextWndGroup, Impl_ScrollHdl));
     const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();