[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loleaflet/dist

[Henry Castro]

 loleaflet/dist/toolbar/toolbar.js |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c4378a4b6e1424f823affe90cf21b727cfc7d167
Author: Henry Castro <hcastro at collabora.com>
Date:   Sun May 29 17:17:25 2016 -0400

    loleaflet: bccu#1804 Style listbox does not get css styling
    
    (cherry picked from commit 2731e1fc0226f180a170860da26027028b655e2d)
    
    loleaflet: bccu#1804 related: do not try to localize user defined style names
    
    (cherry picked from commit 1395d604dd2b071f052c42b89866d33e0d43764e)

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index eeb79d9..58605f6 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -849,7 +849,8 @@ map.on('updatetoolbarcommandvalues', function (e) {
 					var outlineLevel = style.split('outline')[1];
 					localeStyle = 'Outline'.toLocaleString() + ' ' + outlineLevel;
 				} else {
-					localeStyle = L.Styles.styleMappings[style].toLocaleString();
+					localeStyle = L.Styles.styleMappings[style];
+					localeStyle = localeStyle === undefined ? style : localeStyle.toLocaleString();
 				}
 
 				data = data.concat({id: style, text: localeStyle});