loleaflet/src/map/Clipboard.js | 3 ---
loleaflet/src/map/Map.js | 4 ----
2 files changed, 7 deletions(-)
New commits:
commit d85426df88231b2dba012a645cb1ec7cee3efffc
Author: Aron Budea <aron.bu...@collabora.com>
AuthorDate: Tue May 5 00:48:33 2020 +0200
Commit: Aron Budea <aron.bu...@collabora.com>
CommitDate: Tue May 5 01:10:31 2020 +0200
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 <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Aron Budea <aron.bu...@collabora.com>
diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index b7c45e939..700369d29 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;
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 3b2b3b719..982cde654 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
