commit 4259509aa4f11cbcd63299bd17a4503ebdc22fc0
author Andras Timar <andras.timar@collabora.com> Fri May 08 22:01:35 2020 +0200
committer Andras Timar <andras.timar@collabora.com> Fri May 08 22:04:39 2020 +0200
tree 29691e98181e3536fb9b83842aadeb31e60cc232
parent f1dbaac9e4b68941d845a5f0ab7b204e12de14de

Revert "lok: remove sum and equal buttons from the formula bar"

This reverts commit c35aef260feda34eae5e4b8a39f1baaa716b717d.

Reason for revert: patch applied in the wrong order, pre-requsite was not merged

Change-Id: Id3ce6dbac6d9b7589b8d4dd21932b8dee8356c43
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93790
Tested-by: Andras Timar <andras.timar@collabora.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>

sc/source/ui/app/inputwin.cxx

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 930bfe4..4c18661 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -194,16 +194,10 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, const SfxBindings* pBind ) :
        InsertSeparator (1);
        InsertItem      (SID_INPUT_FUNCTION, Image(StockImage::Yes, RID_BMP_INPUT_FUNCTION), ToolBoxItemBits::NONE, 2);
    }

    // sigma and euqal buttons
    if (!mpViewShell->isLOKMobilePhone())
    {
        InsertItem      (SID_INPUT_SUM,      Image(StockImage::Yes, RID_BMP_INPUT_SUM), ToolBoxItemBits::DROPDOWNONLY, 3);
        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);
    }

    InsertItem      (SID_INPUT_SUM,      Image(StockImage::Yes, RID_BMP_INPUT_SUM), ToolBoxItemBits::DROPDOWNONLY, 3);
    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);
    if (!comphelper::LibreOfficeKit::isActive())
    {
        InsertSeparator (7);
@@ -226,27 +220,23 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, const SfxBindings* pBind ) :
        SetHelpId   (SID_INPUT_FUNCTION, HID_INSWIN_CALC);
    }

    // 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_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);
    SetItemText (SID_INPUT_EQUAL, ScResId( SCSTR_QHELP_BTNEQUAL ) );
    SetHelpId   (SID_INPUT_EQUAL, HID_INSWIN_FUNC);

        SetItemText ( SID_INPUT_CANCEL, ScResId( SCSTR_QHELP_BTNCANCEL ) );
        SetHelpId   ( SID_INPUT_CANCEL, HID_INSWIN_CANCEL );
    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 );
    SetItemText ( SID_INPUT_OK, ScResId( SCSTR_QHELP_BTNOK ) );
    SetHelpId   ( SID_INPUT_OK, HID_INSWIN_OK );

        EnableItem( SID_INPUT_CANCEL, false );
        EnableItem( SID_INPUT_OK, false );
    EnableItem( SID_INPUT_CANCEL, false );
    EnableItem( SID_INPUT_OK, false );

        HideItem( SID_INPUT_CANCEL );
        HideItem( SID_INPUT_OK );
    }
    HideItem( SID_INPUT_CANCEL );
    HideItem( SID_INPUT_OK );

    SetHelpId( HID_SC_INPUTWIN ); // For the whole input row