[Libreoffice-commits] online.git: 2 commits - loleaflet/src

[Michael Meeks (via logerrit)]

 loleaflet/src/control/Control.ColumnHeader.js |    2 +-
 loleaflet/src/control/Control.RowHeader.js    |    2 +-
 loleaflet/src/layer/tile/TileLayer.js         |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit edb3a3043a9d90f745778543ae161a711fbd6e51
Author:     Michael Meeks <michael.me...@collabora.com>
AuthorDate: Tue Nov 5 20:32:44 2019 +0000
Commit:     Michael Meeks <michael.me...@collabora.com>
CommitDate: Tue Nov 5 20:32:59 2019 +0000

    avoid hyperlink related exception.
    
    Change-Id: I40663320dede76f6ebb6ead381b10cbb5fd8f2c5

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 912a7e3d8..bc8d905f4 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1052,7 +1052,7 @@ L.TileLayer = L.GridLayer.extend({
                this._map.hyperlinkUnderCursor = obj.hyperlink;
                this._map.closePopup(this._map.hyperlinkPopup);
                this._map.hyperlinkPopup = null;
-               if (obj.hyperlink.link) {
+               if (obj.hyperlink && obj.hyperlink.link) {
                        this._map.hyperlinkPopup = new L.Popup({className: 
'hyperlink-popup', closeButton: false, closeOnClick: false})
                                .setContent('<a href="' + obj.hyperlink.link + 
'" target="_blank">' + obj.hyperlink.link + '</a>')
                                .setLatLng(cursorPos)
commit 84e67f6237f38476e9101c051fc6dac6b94edc72
Author:     Michael Meeks <michael.me...@collabora.com>
AuthorDate: Tue Nov 5 20:31:57 2019 +0000
Commit:     Michael Meeks <michael.me...@collabora.com>
CommitDate: Tue Nov 5 20:32:59 2019 +0000

    avoid exception accessing non-existent options.
    
    introduced in 30f37ef7b080c12febea4971a4ac5cf26a517c5c, oh for
    sensible types.
    
    Change-Id: I411157e71e9ef03dd8305adbe9a1011bb76ed116

diff --git a/loleaflet/src/control/Control.ColumnHeader.js 
b/loleaflet/src/control/Control.ColumnHeader.js
index 19f4a1adb..c68656ae0 100644
--- a/loleaflet/src/control/Control.ColumnHeader.js
+++ b/loleaflet/src/control/Control.ColumnHeader.js
@@ -647,7 +647,7 @@ L.Control.ColumnHeader = L.Control.Header.extend({
                        return;
 
                var rowHeader = 
L.DomUtil.get('spreadsheet-header-rows-container');
-               var document = this.options.documentContainer;
+               var document = this._map.options.documentContainer;
 
                this._setCornerCanvasHeight(height);
                var deltaTop = height - this._canvasHeight;
diff --git a/loleaflet/src/control/Control.RowHeader.js 
b/loleaflet/src/control/Control.RowHeader.js
index d4c4c9eeb..0736af32e 100644
--- a/loleaflet/src/control/Control.RowHeader.js
+++ b/loleaflet/src/control/Control.RowHeader.js
@@ -610,7 +610,7 @@ L.Control.RowHeader = L.Control.Header.extend({
                        return;
 
                var columnHeader = 
L.DomUtil.get('spreadsheet-header-columns-container');
-               var document = this.options.documentContainer;
+               var document = this._map.options.documentContainer;
 
                this._setCornerCanvasWidth(width);
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits