commit d85426df88231b2dba012a645cb1ec7cee3efffc
author Aron Budea <aron.budea@collabora.com> Tue May 05 00:48:33 2020 +0200
committer Aron Budea <aron.budea@collabora.com> Tue May 05 01:10:31 2020 +0200
tree f5d8e079dda7861e5ffdcf2a9c3971507050550d
parent 0d23d91fe3b8e25fd0c2c1049df2e31ac98369ed

Revert "tdf#132125: Pasting into comment pastes...

...into document instead"

It wasn't pasting in correct format when there was no comment,
and the fix has to be extended to Calc/Impress as well.

This reverts commit 9baea8eb9b32e7554a5c81af10eb5e354b6da1d8.

Change-Id: I694700aab0a12d9f2eda5e99b84bfc7e679d7b9c
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93450
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Aron Budea <aron.budea@collabora.com>

loleaflet/src/map/Clipboard.js

diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index b7c45e9..700369d 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -656,9 +656,6 @@ L.Clipboard = L.Class.extend({
		if (isAnyVexDialogActive() && !this._map.hasFocus())
			return;

		if (this._map.isEditingAnnotation())
			return;

		// If the focus is in the search box, paste there.
		if (this._map.isSearching())
			return;

loleaflet/src/map/Map.js

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 3b2b3b7..982cde6 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -966,10 +966,6 @@ L.Map = L.Evented.extend({
		return this._isSearching;
	},

	isEditingAnnotation: function() {
		return this._docLayer._annotations.isEdit();
	},

	_fireInitComplete: function (condition) {
		if (this.initComplete) {
			return;