summaryrefslogtreecommitdiff
path: root/sc/source
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-12-04 21:28:46 +0300
committerAndras Timar <andras.timar@collabora.com>2018-12-29 20:21:04 +0100
commit9972e23fa2ac292310df86c5b7e7ec4d7d6acea6 (patch)
tree9d1884973aad4a720a92b7638d71b3f5a5f718c5 /sc/source
parent7f043d099569e87ac9372975241787f364f0056d (diff)
tdf#117332: select replaced text to properly replace it next time
... othervise the next drag event will insert the new range immediately after the just inserted, resulting in invalid reference. Regression after commit 42aece949ec96c775b31216bddd723aa5321e966 don't replace content of formula field when selecting range, tdf#58635 Change-Id: I7dfdc1ce041ebadf4406dbb605676d87cd489efa Reviewed-on: https://gerrit.libreoffice.org/64574 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 6c5839d399c6277a7f2f0e214a20996761563525) Reviewed-on: https://gerrit.libreoffice.org/65083 Tested-by: Aron Budea <aron.budea@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/ui/condformat/condformatdlg.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index 4f9f82568d1a..00adeac4e296 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -655,7 +655,13 @@ void ScCondFormatDlg::SetReference(const ScRange& rRef, ScDocument*)
OUString aRefStr(rRef.Format(nFlags, mpViewData->GetDocument(),
ScAddress::Details(mpViewData->GetDocument()->GetAddressConvention(), 0, 0)));
if (pEdit != mpEdRange)
+ {
+ Selection sel = pEdit->GetSelection();
+ sel.Justify(); // in case of RtL selection
+ sel.Max() = sel.Min() + aRefStr.getLength();
pEdit->ReplaceSelected(aRefStr);
+ pEdit->SetSelection(sel); // to replace it again with next drag event
+ }
else
pEdit->SetRefString( aRefStr );
updateTitle();