[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sc/source

[Eike Rathke (via logerrit)]

 sc/source/ui/app/inputhdl.cxx |   20 ++++++++++++++++----
 sc/source/ui/inc/inputhdl.hxx |    2 ++
 2 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit 34745c2fdc6a9f75512f793310f95e17c72b6267
Author:     Eike Rathke <er...@redhat.com>
AuthorDate: Tue Jun 21 09:49:31 2022 +0200
Commit:     Eike Rathke <er...@redhat.com>
CommitDate: Tue Jun 21 14:21:12 2022 +0200

    Resolves: tdf#142293 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 <er...@redhat.com>
    Tested-by: Jenkins
    (cherry picked from commit 3a7907664f0e0c6a8357953d244c7e96af9c1622)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136172

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index c5ca8a5a8493..9ad38d7d321d 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -828,6 +828,7 @@ ScInputHandler::ScInputHandler()
         bLastIsSymbol( false ),
         mbDocumentDisposing(false),
         mbPartialPrefix(false),
+        mbEditingExistingContent(false),
         nValidation( 0 ),
         eAttrAdjust( SvxCellHorJustify::Standard ),
         aScaleX( 1,1 ),
@@ -1760,6 +1761,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] == '-');
     }
 
@@ -2564,6 +2568,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?
             {
@@ -2578,8 +2583,7 @@ bool ScInputHandler::StartTable( sal_Unicode cTyped, bool 
bFromCommand, bool bIn
             if ( SC_MOD()->GetAppOptions().GetAutoComplete() )
                 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
@@ -2781,6 +2785,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();
@@ -2789,8 +2800,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 )
@@ -3399,6 +3409,7 @@ void ScInputHandler::EnterHandler( ScEnterMode 
nBlockMode, bool bBeforeSavingInL
     nFormSelStart = nFormSelEnd = 0;
     aFormText.clear();
 
+    mbEditingExistingContent = false;
     bInOwnChange = false;
     bInEnterHandler = false;
     if (bUpdateLayout)
@@ -3413,6 +3424,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
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index 7b06ee3320ed..765c32522b29 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;
@@ -144,6 +145,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();