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

[Libreoffice Gerrit user]

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

New commits:
commit 9ff6dac8528016e39b1884dd7b2f6a6bf707d039
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Wed Jan 2 18:16:49 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Jan 2 20:02:05 2019 +0100

    UI: Show the Insert Chart... toolbar button also in Writer and Impress.
    
    Change-Id: I3178d428ddafc4c54e0223f481b8360493f94f18
    Reviewed-on: https://gerrit.libreoffice.org/65814
    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 187472334..e1050d2f3 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -788,7 +788,6 @@ function createToolbar() {
 		{type: 'button',  id: 'numberformatpercent',  img: 'numberformatpercent', hint: _UNO('.uno:NumberFormatPercent', 'spreadsheet', true), hidden: true, uno: 'NumberFormatPercent', disabled: true},
 		{type: 'button',  id: 'numberformatdecdecimals',  img: 'numberformatdecdecimals', hint: _UNO('.uno:NumberFormatDecDecimals', 'spreadsheet', true), hidden: true, uno: 'NumberFormatDecDecimals', disabled: true},
 		{type: 'button',  id: 'numberformatincdecimals',  img: 'numberformatincdecimals', hint: _UNO('.uno:NumberFormatIncDecimals', 'spreadsheet', true), hidden: true, uno: 'NumberFormatIncDecimals', disabled: true},
-		{type: 'button',  id: 'insertobjectchart',  img: 'insertobjectchart', hint: _UNO('.uno:InsertObjectChart', '', true), hidden: true, uno: 'InsertObjectChart'},
 		{type: 'break',   id: 'break-number', hidden: true},
 		{type: 'button',  id: 'insertannotation', img: 'annotation', hint: _UNO('.uno:InsertAnnotation', '', true), hidden: true},
 		{type: 'drop',  id: 'inserttable',  img: 'inserttable', hint: _('Insert table'), hidden: true, overlay: {onShow: insertTable},
@@ -799,6 +798,7 @@ function createToolbar() {
 				{id: 'localgraphic', text: _('Insert Local Image')},
 				{id: 'remotegraphic', text: _UNO('.uno:InsertGraphic', '', true)},
 			]},
+		{type: 'button',  id: 'insertobjectchart',  img: 'insertobjectchart', hint: _UNO('.uno:InsertObjectChart', '', true), uno: 'InsertObjectChart'},
 		{type: 'drop',  id: 'insertshapes',  img: 'basicshapes_ellipse', hint: _('Insert shapes'), overlay: {onShow: insertShapes},
 			html: '<div id="insertshape-wrapper"><div id="insertshape-popup" class="insertshape-pop ui-widget ui-corner-all"><div class="insertshape-grid"></div></div></div>'},
 
@@ -1571,7 +1571,7 @@ function onDocLayerInit() {
 	switch (docType) {
 	case 'spreadsheet':
 		toolbarUp.show('textalign', 'wraptext', 'breakspacing', 'insertannotation', 'numberformatcurrency', 'numberformatpercent',
-			'numberformatincdecimals', 'numberformatdecdecimals', 'insertobjectchart', 'sum', 'break-number',
+			'numberformatincdecimals', 'numberformatdecdecimals', 'sum', 'break-number',
 			'setborderstyle');
 		toolbarUp.remove('styles');