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

[Libreoffice Gerrit user]

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

New commits:
commit a243c6a093fddb777f6c52b5077213874ac3f448
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Mon Feb 4 15:18:23 2019 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Wed Feb 6 08:59:43 2019 -0400

    loleaflet: calc: show 'merge cells' to the toolbar
    
    Change-Id: I4ed9121a48b3b2dd368ff16d5d7a268f20566609

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index c5bd91ead..591f96361 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -1572,7 +1572,7 @@ function onDocLayerInit() {
 	case 'spreadsheet':
 		toolbarUp.show('textalign', 'wraptext', 'breakspacing', 'insertannotation', 'conditionalformaticonset',
 			'numberformatcurrency', 'numberformatpercent',
-			'numberformatincdecimals', 'numberformatdecdecimals', 'break-number',
+			'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'togglemergecells', 'breakmergecells',
 			'setborderstyle');
 		toolbarUp.remove('styles');