From 4d8fd43ac1428c22d1638bc7a87edcaf02cc25d6 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 4 Mar 2021 11:13:10 +0100
Subject: [PATCH 1/2] Fix error popup when dropping an image into oo

---
 www/common/onlyoffice/inner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js
index e9dc03210..fb864f1e5 100644
--- a/www/common/onlyoffice/inner.js
+++ b/www/common/onlyoffice/inner.js
@@ -1436,7 +1436,7 @@ define([
             */
 
             APP.UploadImageFiles = function (files, type, id, jwt, cb) {
-                cb('NO');
+                return void cb();
             };
             APP.AddImage = function(cb1, cb2) {
                 APP.AddImageSuccessCallback = cb1;

From 00339216108de6ef720011bbea667aef618d22ff Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 5 Mar 2021 11:00:50 +0100
Subject: [PATCH 2/2] Fix OO error

---
 www/common/onlyoffice/inner.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js
index fb864f1e5..0d04d751f 100644
--- a/www/common/onlyoffice/inner.js
+++ b/www/common/onlyoffice/inner.js
@@ -1371,6 +1371,7 @@ define([
                             } catch (e) {}
                         } else {
                             setEditable(true);
+                            deleteOfflineLocks();
                             handleNewLocks({}, content.locks);
                             if (APP.unsavedChanges) {
                                 var unsaved = APP.unsavedChanges;