diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-10-08 05:08:36 +0200 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-10-08 05:53:07 +0200 |
commit | 810cddee6d2ef0f4057337d699a1a55323faa1ba (patch) | |
tree | 1d403cebccb4c4d105ddd9a98b08133aaf079bcc /sw/source | |
parent | e4979457bf11a4ee4594eb2ba3f9bf9ca07fab79 (diff) |
tdf#126589: only consider text to the left of cursor as AutoText short name
Given a text "This is a dtfoo bar", and cursor inside "dtfoo" between "t"
and "f", invoking AutoText function (F3) currently considers the whole word
"dtfoo" as autotext short name. This changes it to only consider the part of
the word to the left of cursor, i.e. only "dt" in the example. This removes
the requirement to have a word boundary after the autotext short name.
Change-Id: I6ba28e63fe25664131b7e03dda39ae997dffa464
Reviewed-on: https://gerrit.libreoffice.org/80419
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/uibase/dochdl/gloshdl.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index b40d6990d192..766f00b631ce 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -351,8 +351,9 @@ bool SwGlossaryHdl::ExpandGlossary(weld::Window* pParent) pWrtShell->LeaveBlockMode(); else if(pWrtShell->IsExtMode()) pWrtShell->LeaveExtMode(); - // select word - pWrtShell->SelNearestWrd(); + // select word (tdf#126589: part to the left of cursor) + if (pWrtShell->IsInWord() || pWrtShell->IsEndWrd()) + pWrtShell->PrvWrd(true); // ask for word if(pWrtShell->IsSelection()) aShortName = pWrtShell->GetSelText(); |