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

[Libreoffice Gerrit user]

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

New commits:
commit 51059c1b549203d36919b2249f4aec56cee90d11
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Mon Feb 4 19:00:07 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Feb 4 19:02:53 2019 +0100

    conditional formatting: Enable the toolbar button in calc.
    
    Change-Id: I7191d367f8cb95e087b8e4899e94d4d241b9fae3
    Reviewed-on: https://gerrit.libreoffice.org/67375
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 106a1dc71..5d948a786 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -1570,7 +1570,8 @@ function onDocLayerInit() {
 
 	switch (docType) {
 	case 'spreadsheet':
-		toolbarUp.show('textalign', 'wraptext', 'breakspacing', 'insertannotation', 'numberformatcurrency', 'numberformatpercent',
+		toolbarUp.show('textalign', 'wraptext', 'breakspacing', 'insertannotation', 'conditionalformaticonset',
+			'numberformatcurrency', 'numberformatpercent',
 			'numberformatincdecimals', 'numberformatdecdecimals', 'sum', 'break-number',
 			'setborderstyle');
 		toolbarUp.remove('styles');