loleaflet/src/control/Control.Toolbar.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 7ef79051e320a4a2a214f3bd8086807be2f46186
Author: Aron Budea <aron.bu...@collabora.com>
AuthorDate: Tue Nov 12 01:14:31 2019 +0100
Commit: Ashod Nakashian <ashnak...@gmail.com>
CommitDate: Tue Nov 12 16:43:08 2019 +0100
loleaflet: Keep original sidebar button in Writer/Calc toolbar
Toolbar buttons had wrong tooltip, and didn't hide the sidebar.
Regression from d902160dd55961845fd766171876fbe4e178538f
and 8a28a560f2674512a552599c5bb85b5ebf5a0bea
Change-Id: Ie85a4bee5d979c0ee1a8d3254faf019161c06869
Reviewed-on: https://gerrit.libreoffice.org/82477
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/loleaflet/src/control/Control.Toolbar.js
b/loleaflet/src/control/Control.Toolbar.js
index c9153c3de..563e0f60a 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -889,6 +889,7 @@ function initNormalToolbar() {
{type: 'spacer'},
{type: 'button', id: 'edit', img: 'edit'},
{type: 'break', id: 'breaksidebar', hidden: true},
+ {type: 'button', id: 'sidebar', img: 'sidebar_modify_page',
hint: _UNO('.uno:Sidebar', '', true), uno: '.uno:Sidebar', hidden: true},
{type: 'button', id: 'sidebar-modify-page', img:
'sidebar_modify_page', hint: _UNO('.uno:ModifyPage', 'presentation', true),
uno: 'ModifyPage', hidden: true},
{type: 'button', id: 'sidebar-slide-change', img:
'sidebar_slide_change', hint: _UNO('.uno:SlideChangeWindow', 'presentation',
true), uno: 'SlideChangeWindow', hidden: true},
{type: 'button', id: 'sidebar-custom-animation', img:
'sidebar_custom_animation', hint: _UNO('.uno:CustomAnimation', 'presentation',
true), uno: 'CustomAnimation', hidden: true},
@@ -1448,7 +1449,7 @@ function onDocLayerInit() {
toolbarUp.show('textalign', 'wraptext', 'breakspacing',
'insertannotation', 'conditionalformaticonset',
'numberformatcurrency', 'numberformatpercent',
'numberformatincdecimals', 'numberformatdecdecimals',
'break-number', 'togglemergecells', 'breakmergecells',
- 'setborderstyle', 'sortascending', 'sortdescending',
'breaksorting', 'backgroundcolor', 'breaksidebar', 'sidebar-modify-page');
+ 'setborderstyle', 'sortascending', 'sortdescending',
'breaksorting', 'backgroundcolor', 'breaksidebar', 'sidebar');
toolbarUp.remove('styles');
}
@@ -1518,7 +1519,7 @@ function onDocLayerInit() {
if (toolbarUp)
toolbarUp.show('leftpara', 'centerpara', 'rightpara',
'justifypara', 'breakpara', 'linespacing',
'breakspacing', 'defaultbullet', 'defaultnumbering',
'breakbullet', 'incrementindent', 'decrementindent',
- 'breakindent', 'inserttable', 'insertannotation',
'backcolor', 'breaksidebar', 'sidebar-modify-page');
+ 'breakindent', 'inserttable', 'insertannotation',
'backcolor', 'breaksidebar', 'sidebar');
if (!_inMobileMode()) {
statusbar.insert('left', [
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
