loleaflet/dist/toolbar/toolbar.js | 8 ++++----
loleaflet/src/control/Control.Menubar.js | 4 +---
2 files changed, 5 insertions(+), 7 deletions(-)
New commits:
commit 0e786d14a0681e5ff9e8b421704593972e0c0a27
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon Dec 5 12:41:47 2016 +0100
disable 'Insert Special Character' for Impress
Change-Id: I6c25d2eb68b0f757771a48bd3c732847d28caff7
Reviewed-on: https://gerrit.libreoffice.org/31628
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index 7279948..a40c4b0 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -810,8 +810,8 @@ map.on('doclayerinit', function () {
case 'presentation':
var presentationToolbar = w2ui['presentation-toolbar'];
presentationToolbar.show('presentation', 'presentationbreak',
'insertpage', 'duplicatepage', 'deletepage');
- toolbarUp.remove('annotation', 'wraptext', 'togglemergecells',
'break-toggle', 'numberformatcurrency', 'numberformatpercent',
'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals',
'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending');
- toolbarUpMore.remove('annotation', 'wraptext',
'togglemergecells', 'break-toggle', 'numberformatcurrency',
'numberformatpercent', 'numberformatdecimal', 'numberformatdate',
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number',
'sortascending', 'sortdescending');
+ toolbarUp.remove('annotation', 'wraptext', 'togglemergecells',
'break-toggle', 'numberformatcurrency', 'numberformatpercent',
'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals',
'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending',
'specialcharacter');
+ toolbarUpMore.remove('annotation', 'wraptext',
'togglemergecells', 'break-toggle', 'numberformatcurrency',
'numberformatpercent', 'numberformatdecimal', 'numberformatdate',
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number',
'sortascending', 'sortdescending', 'specialcharacter');
statusbar.insert('left', [
{type: 'break', id:'break1'},
{type: 'html', id: 'PageStatus',
@@ -819,8 +819,8 @@ map.on('doclayerinit', function () {
]);
break;
case 'drawing':
- toolbarUp.remove('annotation', 'wraptext', 'togglemergecells',
'break-toggle', 'numberformatcurrency', 'numberformatpercent',
'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals',
'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending');
- toolbarUpMore.remove('annotation', 'wraptext',
'togglemergecells', 'break-toggle', 'numberformatcurrency',
'numberformatpercent', 'numberformatdecimal', 'numberformatdate',
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number',
'sortascending', 'sortdescending');
+ toolbarUp.remove('annotation', 'wraptext', 'togglemergecells',
'break-toggle', 'numberformatcurrency', 'numberformatpercent',
'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals',
'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending',
'specialcharacter');
+ toolbarUpMore.remove('annotation', 'wraptext',
'togglemergecells', 'break-toggle', 'numberformatcurrency',
'numberformatpercent', 'numberformatdecimal', 'numberformatdate',
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number',
'sortascending', 'sortdescending', 'specialcharacter');
break;
}
toolbarUp.refresh();
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index e854d5b..4da078a 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -187,9 +187,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Reset zoom'), id: 'zoomreset', type:
'action'}]
},
{name: _('Insert'), type: 'menu', menu: [
- {name: _('Image'), id: 'insertgraphic', type:
'action'},
- {type: 'separator'},
- {name: _('Special character...'), id:
'specialcharacter', type: 'action'}]
+ {name: _('Image'), id: 'insertgraphic', type:
'action'}]
},
{name: _('Tables'), type: 'menu', menu: [
{name: _('Insert'), type: 'menu', menu: [
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
