strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle print-twips 'comment' msg correctly

Browse source 
Change-Id: I36687aab705eef0e3dab3af7d39de7ac390129c0
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98112
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
This commit is contained in:
Dennis Francis 2020-05-27 20:19:14 +05:30
parent 31b3093686
commit 051803327a
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
loleaflet/src/layer/tile/CalcTileLayer.js
View file

@ -243,7 +243,8 @@ L.CalcTileLayer = L.TileLayer.extend({
var obj = JSON.parse(textMsg.substring('comment:'.length + 1));
obj.comment.tab = parseInt(obj.comment.tab);
if (obj.comment.action === 'Add') {
obj.comment.cellPos = L.LOUtil.stringToBounds(obj.comment.cellPos);
var cellPos = L.LOUtil.stringToBounds(obj.comment.cellPos);
obj.comment.cellPos = this._convertToTileTwipsSheetArea(cellPos);
obj.comment.cellPos = L.latLngBounds(this._twipsToLatLng(obj.comment.cellPos.getBottomLeft()),
this._twipsToLatLng(obj.comment.cellPos.getTopRight()));
if (!this._annotations[obj.comment.tab]) {
@ -261,7 +262,8 @@ L.CalcTileLayer = L.TileLayer.extend({
}
} else if (obj.comment.action === 'Modify') {
var modified = this._annotations[obj.comment.tab][obj.comment.id];
obj.comment.cellPos = L.LOUtil.stringToBounds(obj.comment.cellPos);
cellPos = L.LOUtil.stringToBounds(obj.comment.cellPos);
obj.comment.cellPos = this._convertToTileTwipsSheetArea(cellPos);
obj.comment.cellPos = L.latLngBounds(this._twipsToLatLng(obj.comment.cellPos.getBottomLeft()),
this._twipsToLatLng(obj.comment.cellPos.getTopRight()));
if (modified) {
@ -751,7 +753,6 @@ L.SheetGeometry = L.Class.extend({
setTileGeometryData: function (tileWidthTwips, tileHeightTwips, tileSizeCSSPixels,
dpiScale, updatePositions) {
this._columns.setTileGeometryData(tileWidthTwips, tileSizeCSSPixels, dpiScale, updatePositions);
this._rows.setTileGeometryData(tileHeightTwips, tileSizeCSSPixels, dpiScale, updatePositions);
},
@ -997,6 +998,7 @@ L.SheetDimension = L.Class.extend({
},
setTileGeometryData: function (tileSizeTwips, tileSizeCSSPixels, dpiScale, updatePositions) {
if (updatePositions === undefined) {
updatePositions = true;
}