diff options
| author | László Németh <nemeth@numbertext.org> | 2019-01-31 14:27:06 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2019-01-31 18:41:59 +0100 |
| commit | 9cb5b06eea8f0067bb9ddee9f4f1c992eda34a64 (patch) | |
| tree | c07a1c95ae086d9b645b88796c0f27b8219c1359 /sw/source | |
| parent | 50b14658ec0ba6ccd7799a314143f3405d7036b3 (diff) | |
tdf#79197 enable comment of a selected change
with cursor position at the end of the change,
ie. now using "Next Track Change" not only
select the next track change, but it enables
the icon "Insert Track Change Comment" and the
menu item "Edit->Track Changes->Comment...",
and it's possible to add comments as expected.
Change-Id: I21318e70614d1285dd6fd90d8a7cc707fc0b5757
Reviewed-on: https://gerrit.libreoffice.org/67216
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/edit/edredln.cxx | 5 | ||||
| -rw-r--r-- | sw/source/uibase/shells/textfld.cxx | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sw/source/core/edit/edredln.cxx b/sw/source/core/edit/edredln.cxx index 2eadec1494e0..f75b58b4fb7c 100644 --- a/sw/source/core/edit/edredln.cxx +++ b/sw/source/core/edit/edredln.cxx @@ -119,7 +119,10 @@ bool SwEditShell::SetRedlineComment( const OUString& rS ) const SwRangeRedline* SwEditShell::GetCurrRedline() const { - return GetDoc()->getIDocumentRedlineAccess().GetRedline( *GetCursor()->GetPoint(), nullptr ); + if (const SwRangeRedline* pRed = GetDoc()->getIDocumentRedlineAccess().GetRedline( *GetCursor()->GetPoint(), nullptr )) + return pRed; + // check the other side of the selection to handle completely selected changes, where the Point is at the end + return GetDoc()->getIDocumentRedlineAccess().GetRedline( *GetCursor()->GetMark(), nullptr ); } void SwEditShell::UpdateRedlineAttr() diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx index 6d97556e3f48..23b295ead89c 100644 --- a/sw/source/uibase/shells/textfld.cxx +++ b/sw/source/uibase/shells/textfld.cxx @@ -567,7 +567,10 @@ void SwTextShell::ExecField(SfxRequest &rReq) rSh.EndAction(); rSh.ClearMark(); - rSh.SelNextRedline(); // Select current redline. + // Select current redline. + pActRed = rSh.SelNextRedline(); + if (pActRed != pRedline) + rSh.SelPrevRedline(); rSh.StartAction(); rSh.Push(); |