[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src

[Szymon KÅ‚os (via logerrit)]

 loleaflet/src/map/Clipboard.js |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0c40427b0f6c039be784fd530a24f58ba79f82a4
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Jul 16 10:47:05 2020 +0200
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Tue Jul 21 10:41:44 2020 +0200

    clipboard: paste in dialog if open
    
    This fixes the issue where 'complex' content was copied
    and then when dialog was opened and user used Ctrl+V,
    internal paste into document was performed instead
    od pasting into dialog.
    
    Change-Id: I540a98484610916ff7c246f08a9772fbff40b3ec
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98877
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98942
    Reviewed-by: Aron Budea <aron.budea at collabora.com>

diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index 18678b389..ce8ccb195 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -336,7 +336,7 @@ L.Clipboard = L.Class.extend({
 		{
 			// Home from home: short-circuit internally.
 			console.log('short-circuit, internal paste');
-			this._map._socket.sendMessage('uno .uno:Paste');
+			this._doInternalPaste(this._map, usePasteKeyEvent);
 			return;
 		}