[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - sw/source

[Samuel Mehrbrodt (via logerrit)]

 sw/source/core/crsr/crstrvl.cxx  |    2 +-
 sw/source/core/txtnode/ndtxt.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4cb7e97ac32cde58a6c8de1301f05306ea326ea8
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Thu Aug 20 15:33:49 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Mon Sep 21 17:05:55 2020 +0200

    Related tdf#100492 Detect click into empty field
    
    Change-Id: Ic2937d619a8361b9d17b7dfa16698a5005f34ec6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101076
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    (cherry picked from commit 2c7bf3543ab798d1c117d9f3258467e4aef9a8db)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103107
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 67c6fc7df511..749416c00636 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -898,7 +898,7 @@ bool SwCursorShell::CursorInsideInputField() const
 {
     for(SwPaM& rCursor : GetCursor()->GetRingContainer())
     {
-        if (dynamic_cast<const SwTextInputField*>(GetTextFieldAtCursor(&rCursor, false)))
+        if (dynamic_cast<const SwTextInputField*>(GetTextFieldAtCursor(&rCursor, true)))
             return true;
     }
     return false;
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index c90e91bafaf1..5ca09ba95fd4 100755
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1798,7 +1798,7 @@ SwTextField* SwTextNode::GetFieldTextAttrAt(
             dynamic_cast<SwTextField*>( GetTextAttrAt(
                 nIndex,
                 RES_TXTATR_INPUTFIELD,
-                bIncludeInputFieldAtStart ? DEFAULT : PARENT ));
+                bIncludeInputFieldAtStart ? DEFAULT : EXPAND ));
     }
 
     return pTextField;