diff options
| author | Tor Lillqvist <tml@collabora.com> | 2019-07-30 11:48:19 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2019-07-30 14:01:42 +0200 |
| commit | 30a75a8d3dcfcca2cf349d9df797ac0b1550eb5e (patch) | |
| tree | 8ec46bc1978f9e140c2c511c0a74671997aaecab | |
| parent | 517df6f02f396fafa04c00d0b17743c59105bb7b (diff) | |
tdf#125568: We need the selection string also when not "in selection mode"
Apparently being "in selection mode" has nothing to do with whether we
have a selection that we are enlarging by dragging the end marker?
Change-Id: I546a1685bd3a0102e16c1f8bc6e721819ed986e2
Reviewed-on: https://gerrit.libreoffice.org/76588
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/76591
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
| -rw-r--r-- | editeng/source/editeng/impedit.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index a30d658ba492..5b7de9ae81e3 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/datatransfer/clipboard/SystemClipboard.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp> +#include <comphelper/lok.hxx> #include <editeng/flditem.hxx> #include <svl/intitem.hxx> #include <vcl/inputctx.hxx> @@ -411,7 +412,10 @@ void ImpEditView::DrawSelectionXOR( EditSelection aTmpSel, vcl::Region* pRegion, OString sRectangle; // If we are not in selection mode, then the exported own selection should be empty. - if (pEditEngine->pImpEditEngine->IsInSelectionMode() || mpOtherShell) + // This is needed always in Online, regardless whether in "selection mode" (whatever + // that is) or not, for tdf#125568, but I don't have the clout to make this completely + // unconditional also for desktop LO. + if (comphelper::LibreOfficeKit::isActive() || pEditEngine->pImpEditEngine->IsInSelectionMode() || mpOtherShell) { std::vector<tools::Rectangle> aRectangles; pRegion->GetRegionRectangles(aRectangles); |