loleaflet/dist/toolbar/toolbar.js | 8 ++++----
loleaflet/src/control/Control.Menubar.js | 4 +++-
2 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit d694ac0a9cc2a781fd6aa71400e3e3db92c9d26f
Author: Henry Castro <hcas...@collabora.com>
Date: Fri Dec 16 22:34:53 2016 -0400
Revert "disable 'Insert Special Character' for Impress"
This reverts commit 0e786d14a0681e5ff9e8b421704593972e0c0a27.
Change-Id: I9e301d7d2b6e7d2626de91c242b7617faa823572
Reviewed-on: https://gerrit.libreoffice.org/32109
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
Tested-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index 2c14936..191011d 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -851,8 +851,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',
'specialcharacter');
- toolbarUpMore.remove('annotation', 'wraptext',
'togglemergecells', 'break-toggle', 'numberformatcurrency',
'numberformatpercent', 'numberformatdecimal', 'numberformatdate',
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number',
'sortascending', 'sortdescending', 'specialcharacter');
+ 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');
statusbar.insert('left', [
{type: 'break', id:'break1'},
{type: 'html', id: 'PageStatus',
@@ -860,8 +860,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',
'specialcharacter');
- toolbarUpMore.remove('annotation', 'wraptext',
'togglemergecells', 'break-toggle', 'numberformatcurrency',
'numberformatpercent', 'numberformatdecimal', 'numberformatdate',
'numberformatincdecimals', 'numberformatdecdecimals', 'break-number',
'sortascending', 'sortdescending', 'specialcharacter');
+ 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');
break;
}
toolbarUp.refresh();
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 4da078a..e854d5b 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -187,7 +187,9 @@ L.Control.Menubar = L.Control.extend({
{name: _('Reset zoom'), id: 'zoomreset', type:
'action'}]
},
{name: _('Insert'), type: 'menu', menu: [
- {name: _('Image'), id: 'insertgraphic', type:
'action'}]
+ {name: _('Image'), id: 'insertgraphic', type:
'action'},
+ {type: 'separator'},
+ {name: _('Special character...'), id:
'specialcharacter', 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
