[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src

Szymon KÅ‚os (via logerrit) logerrit at kemper.freedesktop.org
Mon Jul 20 12:40:51 UTC 2020


 loleaflet/src/control/Ruler.js |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 58457e5c5f75dd84b532dbd85da0491908fc72fb
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Jun 18 14:27:27 2020 +0200
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Mon Jul 20 14:40:33 2020 +0200

    Avoid usage of undefined when no margin set
    
    Change-Id: Ie922448e37e4414f054fa0404ea5787212c446dd
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96679
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    (cherry picked from commit 91d2e967461f5bb4552c8332faa393ba97e59f11)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98969
    Reviewed-by: Aron Budea <aron.budea at collabora.com>

diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js
index 011b16488..e717d84e3 100644
--- a/loleaflet/src/control/Ruler.js
+++ b/loleaflet/src/control/Ruler.js
@@ -211,6 +211,9 @@ L.Control.Ruler = L.Control.extend({
 		var items = this._map['stateChangeHandler'];
 		var state = items.getItemValue('.uno:LeftRightParaMargin');
 
+		if (!state)
+			return;
+
 		this.options.firstLineIndent = parseFloat(state.firstline.replace(',', '.'));
 		this.options.leftParagraphIndent = parseFloat(state.left.replace(',', '.'));
 		this.options.rightParagraphIndent = parseFloat(state.right.replace(',', '.'));


More information about the Libreoffice-commits mailing list