summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2019-07-30 11:48:19 +0300
committerTor Lillqvist <tml@collabora.com>2019-07-30 14:27:24 +0200
commite74a67b5a4dac004901fe08bf0d76682badeb6ab (patch)
treedcbf3f778c2f1ba7dfe7e962a83b14f7d049eea7 /editeng
parent3afa75a5bb3367d763c9ef4daca05b806e3b5ee2 (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/76592 Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/editeng/impedit.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 0f91a4fa24eb..edf393485b87 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -30,6 +30,7 @@
#include <com/sun/star/datatransfer/dnd/XDropTarget.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/transfer.hxx>
@@ -403,7 +404,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);