From c9450de79978a647732be3acb62e34da25473e6f Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 5 Feb 2019 16:19:09 +0100
Subject: [PATCH] Fix 'lock is null' error in onlyoffice apps

---
 www/common/onlyoffice/sdkjs/cell/sdk-all-min.js  | 3 ++-
 www/common/onlyoffice/sdkjs/slide/sdk-all-min.js | 3 ++-
 www/common/onlyoffice/sdkjs/word/sdk-all-min.js  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/www/common/onlyoffice/sdkjs/cell/sdk-all-min.js b/www/common/onlyoffice/sdkjs/cell/sdk-all-min.js
index 7f3e60511..50e303b4d 100644
--- a/www/common/onlyoffice/sdkjs/cell/sdk-all-min.js
+++ b/www/common/onlyoffice/sdkjs/cell/sdk-all-min.js
@@ -3717,8 +3717,9 @@ AscBrowser.convertToRetinaValue = function(value, isScale)
       var bSendEnd = false;
       for (var block in data["locks"]) {
         if (data["locks"].hasOwnProperty(block)) {
-          var lock = data["locks"][block], blockTmp = (this._isExcel || this._isPresentation) ? lock["block"]["guid"] : lock["block"];
+          var lock = data["locks"][block];
           if (lock !== null) {
+            var blockTmp = (this._isExcel || this._isPresentation) ? lock["block"]["guid"] : lock["block"];
             this._locks[blockTmp] = {"state": 0, "user": lock["user"], "time": lock["time"], "changes": lock["changes"], "block": lock["block"]};
             if (this.onLocksReleased) {
               // true - lock with save
diff --git a/www/common/onlyoffice/sdkjs/slide/sdk-all-min.js b/www/common/onlyoffice/sdkjs/slide/sdk-all-min.js
index 1fe52b662..9115f6909 100644
--- a/www/common/onlyoffice/sdkjs/slide/sdk-all-min.js
+++ b/www/common/onlyoffice/sdkjs/slide/sdk-all-min.js
@@ -3717,8 +3717,9 @@ AscBrowser.convertToRetinaValue = function(value, isScale)
       var bSendEnd = false;
       for (var block in data["locks"]) {
         if (data["locks"].hasOwnProperty(block)) {
-          var lock = data["locks"][block], blockTmp = (this._isExcel || this._isPresentation) ? lock["block"]["guid"] : lock["block"];
+          var lock = data["locks"][block];
           if (lock !== null) {
+            var blockTmp = (this._isExcel || this._isPresentation) ? lock["block"]["guid"] : lock["block"];
             this._locks[blockTmp] = {"state": 0, "user": lock["user"], "time": lock["time"], "changes": lock["changes"], "block": lock["block"]};
             if (this.onLocksReleased) {
               // true - lock with save
diff --git a/www/common/onlyoffice/sdkjs/word/sdk-all-min.js b/www/common/onlyoffice/sdkjs/word/sdk-all-min.js
index 9d58b4050..4ad10514b 100644
--- a/www/common/onlyoffice/sdkjs/word/sdk-all-min.js
+++ b/www/common/onlyoffice/sdkjs/word/sdk-all-min.js
@@ -3717,8 +3717,9 @@ AscBrowser.convertToRetinaValue = function(value, isScale)
       var bSendEnd = false;
       for (var block in data["locks"]) {
         if (data["locks"].hasOwnProperty(block)) {
-          var lock = data["locks"][block], blockTmp = (this._isExcel || this._isPresentation) ? lock["block"]["guid"] : lock["block"];
+          var lock = data["locks"][block];
           if (lock !== null) {
+            var blockTmp = (this._isExcel || this._isPresentation) ? lock["block"]["guid"] : lock["block"];
             this._locks[blockTmp] = {"state": 0, "user": lock["user"], "time": lock["time"], "changes": lock["changes"], "block": lock["block"]};
             if (this.onLocksReleased) {
               // true - lock with save