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

[Dennis Francis (via logerrit)]

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

New commits:
commit a42d4103e714695ee4e33536806521d269beba6f
Author:     Dennis Francis <dennis.francis at collabora.com>
AuthorDate: Sat Jun 6 13:30:18 2020 +0530
Commit:     Dennis Francis <dennis.francis at collabora.com>
CommitDate: Mon Jul 6 19:01:37 2020 +0200

    Allow tile-twips coordinates for chart/draw edit cursor messages for now
    
    Print twips coordinates for chart/draw edit-cursor is not there yet in
    core (needs more work).
    
    Change-Id: If8cd9431fa43351340c74e989ee837f4b1b859dd
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98152
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Tested-by: Jenkins
    Reviewed-by: Dennis Francis <dennis.francis at collabora.com>

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js b/loleaflet/src/layer/tile/CalcTileLayer.js
index 4a2dcc8c8..3b9548106 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -780,7 +780,10 @@ L.CalcTileLayer = L.TileLayer.extend({
 
 	_getEditCursorRectangle: function (msgObj) {
 
-		if (!this.options.printTwipsMsgsEnabled) {
+		if (!this.options.printTwipsMsgsEnabled ||
+			!msgObj.hasOwnProperty('relrect') || !msgObj.hasOwnProperty('refpoint')) {
+			// 1) non-print-twips messaging mode OR
+			// 2) the edit-cursor belongs to draw/chart objects.
 			return L.TileLayer.prototype._getEditCursorRectangle.call(this, msgObj);
 		}
 
@@ -789,13 +792,6 @@ L.CalcTileLayer = L.TileLayer.extend({
 			return undefined;
 		}
 
-		if (!msgObj.hasOwnProperty('relrect') || !msgObj.hasOwnProperty('refpoint')) {
-			// This can happen because the kit sends such messages (sometimes)
-			// after doing its own parsing (probably needed for writer/impress?).
-			// These aren't needed for Calc.
-			return undefined;
-		}
-
 		var relrect = L.Bounds.parse(msgObj.relrect);
 		var refpoint = L.Point.parse(msgObj.refpoint);
 		refpoint = this.sheetGeometry.getTileTwipsPointFromPrint(refpoint);