[Libreoffice-commits] online.git: Branch 'libreoffice-5-4' - loleaflet/src

[Marco Cecchetti]

 loleaflet/src/layer/tile/CalcTileLayer.js |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 86a08d8da86dcdbb0138e79bb08311a912a0a4dc
Author: Marco Cecchetti <marco.cecchetti at collabora.com>
Date:   Mon Dec 18 21:50:37 2017 +0100

    loleaflet: calc: wrong data in firing of updaterowcolumnheaders event
    
    two fixes:
    
    - wrong data in firing of updaterowcolumnheaders event (messing up
    pg-up/pg-down)
    
    - console error message about invocation of a method for an undefined
    object (annotation.mark)
    
    Change-Id: I4e7d9de38ffe18b477c99147966fd91d7a460841
    Reviewed-on: https://gerrit.libreoffice.org/46744
    Reviewed-by: Marco Cecchetti <mrcekets at gmail.com>
    Tested-by: Marco Cecchetti <mrcekets at gmail.com>
    (cherry picked from commit ba20cd134136a101960552f9432fb3f5969868cd)
    Reviewed-on: https://gerrit.libreoffice.org/49020
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js b/loleaflet/src/layer/tile/CalcTileLayer.js
index f0a39644..ad6cf6d3 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -211,7 +211,7 @@ L.CalcTileLayer = L.TileLayer.extend({
 			this._map.fire('updaterowcolumnheaders', {x: 0, y: this._map._getTopLeftPoint().y, offset: {x: 0, y: undefined}});
 			this._map._socket.sendMessage('commandvalues command=.uno:ViewAnnotationsPosition');
 		} else if (textMsg.startsWith('invalidateheader: all')) {
-			this._map.fire('updaterowcolumnheaders', {x: this._map._getTopLeftPoint().x, y: this._map._getTopLeftPoint(), offset: {x: undefined, y: undefined}});
+			this._map.fire('updaterowcolumnheaders', {x: this._map._getTopLeftPoint().x, y: this._map._getTopLeftPoint().y, offset: {x: undefined, y: undefined}});
 			this._map._socket.sendMessage('commandvalues command=.uno:ViewAnnotationsPosition');
 		} else {
 			L.TileLayer.prototype._onMessage.call(this, textMsg, img);
@@ -464,7 +464,9 @@ L.CalcTileLayer = L.TileLayer.extend({
 				var annotation = this._annotations[comment.tab][comment.id];
 				if (annotation) {
 					annotation.setLatLngBounds(comment.cellPos);
-					annotation.mark.setLatLng(comment.cellPos.getNorthEast());
+					if (annotation.mark) {
+						annotation.mark.setLatLng(comment.cellPos.getNorthEast());
+					}
 				}
 			}
 			this.showAnnotations();