loleaflet/dist/toolbar/toolbar.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit dd2bd354fd90b0e5e253549443765cd7a9ed2853
Author: Andras Timar <andras.ti...@collabora.com>
Date: Wed Jun 27 14:51:24 2018 +0200
loleaflet: hide 'Conditional Formatting Menu' for Writer, Impress and Draw
Change-Id: I31d9f7b2b974213ea27af8aee6a752c61eb911cf
Reviewed-on: https://gerrit.libreoffice.org/56527
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index 03bd5846a..de360832b 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1040,7 +1040,7 @@ map.on('doclayerinit', function () {
break;
case 'text':
- toolbarUp.remove('wraptextseparator', 'wraptext',
'togglemergecells', 'break-toggle', 'numberformatcurrency',
'numberformatpercent', 'numberformatdecimal', 'numberformatdate',
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number',
'sortascending', 'sortdescending', 'setborderstyle', 'conditionalformatmenu');
+ toolbarUp.remove('wraptextseparator', 'wraptext',
'togglemergecells', 'break-toggle', 'numberformatcurrency',
'numberformatpercent', 'numberformatdecimal', 'numberformatdate',
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number',
'sortascending', 'sortdescending', 'setborderstyle',
'conditionalformaticonset');
statusbar.insert('left', [
{type: 'break', id: 'break1'},
{type: 'html', id: 'StatePageNumber',
@@ -1071,7 +1071,7 @@ map.on('doclayerinit', function () {
if (!map['wopi'].HideExportOption) {
presentationToolbar.show('presentation',
'presentationbreak');
}
- toolbarUp.remove('insertannotation', 'wraptextseparator',
'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency',
'numberformatpercent', 'numberformatdecimal', 'numberformatdate',
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number',
'sortascending', 'sortdescending', 'setborderstyle', 'conditionalformatmenu');
+ toolbarUp.remove('insertannotation', 'wraptextseparator',
'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency',
'numberformatpercent', 'numberformatdecimal', 'numberformatdate',
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number',
'sortascending', 'sortdescending', 'setborderstyle',
'conditionalformaticonset');
statusbar.insert('left', [
{type: 'break', id:'break1'},
{type: 'html', id: 'PageStatus',
@@ -1087,7 +1087,7 @@ map.on('doclayerinit', function () {
break;
case 'drawing':
- toolbarUp.remove('insertannotation', 'wraptextseparator',
'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency',
'numberformatpercent', 'numberformatdecimal', 'numberformatdate',
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number',
'sortascending', 'sortdescending', 'setborderstyle', 'conditionalformatmenu');
+ toolbarUp.remove('insertannotation', 'wraptextseparator',
'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency',
'numberformatpercent', 'numberformatdecimal', 'numberformatdate',
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number',
'sortascending', 'sortdescending', 'setborderstyle',
'conditionalformaticonset');
// Remove irrelevant toolbars
$('#formulabar').hide();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
