commit 2f6b667ce9bf3d3d1bfd13d25b6c7605fc01577c
author Eike Rathke <erack@redhat.com> Tue Jun 21 09:49:31 2022 +0200
committer Caolán McNamara <caolanm@redhat.com> Wed Jun 22 20:43:15 2022 +0200
tree 167c33478105198201a1872a50c80446e636888f
parent 9ccd84fb9df1767ff01a99378ff240c4d5fed7c3

Resolves: tdf#149589 No "+ or - may start formula" when editing content

If it was a formula already it would start with = anyway.

Change-Id: Ib3c0ebcaf99231d387f1aace8e1a5642061de3a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136208
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 909cdd552199d35f7c10be0a8be370158aea0815)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136173
Tested-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

sc/source/ui/app/inputhdl.cxx

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 042fed7..088d3ec 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -830,6 +830,7 @@ ScInputHandler::ScInputHandler()
        bLastIsSymbol( false ),
        mbDocumentDisposing(false),
        mbPartialPrefix(false),
        mbEditingExistingContent(false),
        nValidation( 0 ),
        eAttrAdjust( SvxCellHorJustify::Standard ),
        aScaleX( 1,1 ),
@@ -1768,6 +1769,9 @@ void ScInputHandler::LOKPasteFunctionData(const OUString& rFunctionName)
    if (pEditEngine)
    {
        aFormula = pEditEngine->GetText(0);
        /* TODO: LOK: are you sure you want '+' and '-' let start formulas with
         * function names? That was meant for "data typist" numeric keyboard
         * input. */
        bEdit = aFormula.getLength() > 1 && (aFormula[0] == '=' || aFormula[0] == '+' || aFormula[0] == '-');
    }

@@ -2556,6 +2560,7 @@ bool ScInputHandler::StartTable( sal_Unicode cTyped, bool bFromCommand, bool bIn
            }
            else
                aStr = GetEditText(mpEditEngine.get());
            mbEditingExistingContent = !aStr.isEmpty();

            if (aStr.startsWith("{=") && aStr.endsWith("}") )  // Matrix formula?
            {
@@ -2570,8 +2575,7 @@ bool ScInputHandler::StartTable( sal_Unicode cTyped, bool bFromCommand, bool bIn
            if ( bAutoComplete )
                GetColData();

            if ( !aStr.isEmpty() && ( aStr[0] == '=' || aStr[0] == '+' || aStr[0] == '-' ) &&
                 !cTyped && !bCreatingFuncView )
            if (!cTyped && !bCreatingFuncView && StartsLikeFormula(aStr))
                InitRangeFinder(aStr); // Formula is being edited -> RangeFinder

            bNewTable = true; // -> PostEditView Call
@@ -2762,6 +2766,13 @@ void ScInputHandler::DataChanged( bool bFromTopNotify, bool bSetModified )
    bInOwnChange = false;
}

bool ScInputHandler::StartsLikeFormula( std::u16string_view rStr ) const
{
    // For new input '+' and '-' may start the dreaded "lazy data typist"
    // formula input, editing existing formula content can only start with '='.
    return !rStr.empty() && (rStr[0] == '=' || (!mbEditingExistingContent && (rStr[0] == '+' || rStr[0] == '-')));
}

void ScInputHandler::UpdateFormulaMode()
{
    SfxApplication* pSfxApp = SfxGetpApp();
@@ -2770,8 +2781,7 @@ void ScInputHandler::UpdateFormulaMode()
    if (bIsFormula)
    {
        const OUString& rText = mpEditEngine->GetText(0);
        bIsFormula = !rText.isEmpty() &&
            (rText[0] == '=' || rText[0] == '+' || rText[0] == '-');
        bIsFormula = StartsLikeFormula(rText);
    }

    if ( bIsFormula )
@@ -3377,6 +3387,7 @@ void ScInputHandler::EnterHandler( ScEnterMode nBlockMode, bool bBeforeSavingInL
    nFormSelStart = nFormSelEnd = 0;
    aFormText.clear();

    mbEditingExistingContent = false;
    bInOwnChange = false;
    bInEnterHandler = false;
}
@@ -3389,6 +3400,7 @@ void ScInputHandler::CancelHandler()

    bModified = false;
    mbPartialPrefix = false;
    mbEditingExistingContent = false;

    // Don't rely on ShowRefFrame switching the active view synchronously
    // execute the function directly on the correct view's bindings instead

sc/source/ui/inc/inputhdl.hxx

diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index f66688a..88ec1dd 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -105,6 +105,7 @@ private:
    bool                    mbDocumentDisposing:1;
    /// To indicate if there is a partial prefix completion.
    bool                    mbPartialPrefix:1;
    bool                    mbEditingExistingContent:1;

    sal_uLong                   nValidation;
    SvxCellHorJustify       eAttrAdjust;
@@ -146,6 +147,7 @@ private:
    bool            StartTable( sal_Unicode cTyped, bool bFromCommand, bool bInputActivated,
                                ScEditEngineDefaulter* pTopEngine );
    void            RemoveSelection();
    bool            StartsLikeFormula( std::u16string_view rStr ) const;
    void            UpdateFormulaMode();
    static void     InvalidateAttribs();
    void            ImplCreateEditEngine();