summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2020-08-20 15:33:49 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2020-09-21 20:53:14 +0200
commit1d51724adc5719e440ca0b457c80c161d8ca04c8 (patch)
treed7ed01c35b67595dc2b60fd96583aa32e44a6ef3 /sw
parent3fde2939866411c65daef26963aecff72c099532 (diff)
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@cib.de> (cherry picked from commit 2c7bf3543ab798d1c117d9f3258467e4aef9a8db) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103108 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/crsr/crstrvl.cxx2
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 9153b8b34e85..7df0ce6ff323 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -949,7 +949,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 3d721ebee00b..28cb96d2c71b 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1788,7 +1788,7 @@ SwTextField* SwTextNode::GetFieldTextAttrAt(
dynamic_cast<SwTextField*>( GetTextAttrAt(
nIndex,
RES_TXTATR_INPUTFIELD,
- bIncludeInputFieldAtStart ? DEFAULT : PARENT ));
+ bIncludeInputFieldAtStart ? DEFAULT : EXPAND ));
}
return pTextField;