editeng/source/editeng/impedit.cxx | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit e74a67b5a4dac004901fe08bf0d76682badeb6ab
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Tue Jul 30 11:48:19 2019 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Tue Jul 30 14:27:24 2019 +0200
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 <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/76592
Reviewed-by: Tor Lillqvist <t...@collabora.com>
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);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
