Menubar update sync with LibO private/kara/andreas-kainz-menubar

Change-Id: If6631438057c8f955617924315196fa749102328

2 files changed, 46 insertions, 35 deletions

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index ea2e23eeef..f33cbdacfa 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -19,7 +19,6 @@ L.Control.Menubar = L.Control.extend({
 				{name: _UNO('.uno:Save', 'text'), id: 'save', type: 'action'},
 				{name: _UNO('.uno:SaveAs', 'text'), id: 'saveas', type: 'action'},
 				{name: _('Share...'), id:'shareas', type: 'action'},
-				{name: _UNO('.uno:Print', 'text'), id: 'print', type: 'action'},
 				{name: _('See revision history'), id: 'rev-history', type: 'action'},
 				{name: !window.ThisIsAMobileApp ? _('Download as') : _('Export as'), id: 'downloadas', type: 'menu', menu: [
 					{name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
@@ -28,8 +27,9 @@ L.Control.Menubar = L.Control.extend({
 					{name: _('Word Document (.docx)'), id: 'downloadas-docx', type: 'action'},
 					{name: _('Rich Text (.rtf)'), id: 'downloadas-rtf', type: 'action'},
 					{name: _('EPUB (.epub)'), id: 'downloadas-epub', type: 'action'}]},
-				{name: _('Sign document'), id: 'signdocument', type: 'action'},
 				{type: 'separator'},
+				{name: _UNO('.uno:Print', 'text'), id: 'print', type: 'action'},
+				{name: _('Sign document'), id: 'signdocument', type: 'action'},
 				{name: _('Close document'), id: 'closedocument', type: 'action'}
 			]},
 			{name: _UNO('.uno:EditMenu', 'text'), id: 'editmenu', type: 'menu', menu: [
@@ -63,15 +63,14 @@ L.Control.Menubar = L.Control.extend({
 					{name: _UNO('.uno:ZoomPlus', 'text'), id: 'zoomin', type: 'action'},
 					{name: _UNO('.uno:ZoomMinus', 'text'), id: 'zoomout', type: 'action',},
 					{name: _('Reset zoom'), id: 'zoomreset', type: 'action'},
+					{type: 'separator'},
 					{name: _('Show Ruler'), id: 'showruler', type: 'action'},
 					{name: _('Show Status Bar'), id: 'showstatusbar', type: 'action'},
-					{type: 'separator'},
 				]).concat([
-					{uno: '.uno:ControlCodes'},
+					{uno: '.uno:Sidebar'},
 					{type: 'separator'},
+					{uno: '.uno:ControlCodes'},
 					{name: _UNO('.uno:ShowResolvedAnnotations', 'text'), id: 'showresolved', type: 'action'},
-					{type: 'separator'},
-					{uno: '.uno:Sidebar'},
 				])},
 			{name: _UNO('.uno:InsertMenu', 'text'), id: 'insert', type: 'menu', menu: [
 				{name: _('Local Image...'), id: 'insertgraphic', type: 'action'},
@@ -79,25 +78,6 @@ L.Control.Menubar = L.Control.extend({
 				{name: _UNO('.uno:InsertAnnotation', 'text'), id: 'insertcomment', type: 'action'},
 				{uno: '.uno:InsertObjectChart'},
 				{type: 'separator'},
-				{uno: '.uno:InsertSection', id: 'insertsection'},
-				{name: _UNO('.uno:InsertField', 'text'), type: 'menu', menu: [
-					{uno: '.uno:InsertPageNumberField'},
-					{uno: '.uno:InsertPageCountField'},
-					{uno: '.uno:InsertDateField'},
-					{uno: '.uno:InsertTimeField'},
-					{uno: '.uno:InsertTitleField'},
-					{uno: '.uno:InsertAuthorField'},
-					{uno: '.uno:InsertTopicField'}
-				]},
-				{name: _UNO('.uno:InsertHeaderFooterMenu', 'text'), type: 'menu', menu: [
-					{name: _UNO('.uno:InsertPageHeader', 'text'), type: 'menu', menu: [
-						{name: _('All'), disabled: true, id: 'insertheader', tag: '_ALL_', uno: '.uno:InsertPageHeader?'}]},
-					{name: _UNO('.uno:InsertPageFooter', 'text'), type: 'menu', menu: [
-						{name: _('All'), disabled: true, id: 'insertfooter', tag: '_ALL_', uno: '.uno:InsertPageFooter?'}]}
-				]},
-				{uno: '.uno:InsertFootnote'},
-				{uno: '.uno:InsertEndnote'},
-				{type: 'separator'},
 				{uno: '.uno:InsertPagebreak'},
 				{name: _UNO('.uno:InsertColumnBreak', 'spreadsheet'), uno: '.uno:InsertColumnBreak'},
 				{type: 'separator'},
@@ -111,10 +91,30 @@ L.Control.Menubar = L.Control.extend({
 					{uno: '.uno:InsertZWNBSP'},
 					{uno: '.uno:InsertLRM'},
 					{uno: '.uno:InsertRLM'}]},
+				{type: 'separator'},
+				{uno: '.uno:InsertFootnote'},
+				{uno: '.uno:InsertEndnote'},
 				{name: _UNO('.uno:IndexesMenu', 'text'), type: 'menu', menu: [
 					{uno: '.uno:InsertIndexesEntry'},
 					{uno: '.uno:InsertAuthoritiesEntry'},
 					{uno: '.uno:InsertMultiIndex'}]},
+				{type: 'separator'},
+				{uno: '.uno:InsertSection', id: 'insertsection'},
+				{name: _UNO('.uno:InsertField', 'text'), type: 'menu', menu: [
+					{uno: '.uno:InsertPageNumberField'},
+					{uno: '.uno:InsertPageCountField'},
+					{uno: '.uno:InsertDateField'},
+					{uno: '.uno:InsertTimeField'},
+					{uno: '.uno:InsertTitleField'},
+					{uno: '.uno:InsertAuthorField'},
+					{uno: '.uno:InsertTopicField'}
+				]},
+				{name: _UNO('.uno:InsertHeaderFooterMenu', 'text'), type: 'menu', menu: [
+					{name: _UNO('.uno:InsertPageHeader', 'text'), type: 'menu', menu: [
+						{name: _('All'), disabled: true, id: 'insertheader', tag: '_ALL_', uno: '.uno:InsertPageHeader?'}]},
+					{name: _UNO('.uno:InsertPageFooter', 'text'), type: 'menu', menu: [
+						{name: _('All'), disabled: true, id: 'insertfooter', tag: '_ALL_', uno: '.uno:InsertPageFooter?'}]}
+				]},
 			]},
 			{name: _UNO('.uno:FormatMenu', 'text'), id: 'format', type: 'menu', menu: [
 				{name: _UNO('.uno:FormatTextMenu', 'text'), type: 'menu', menu: [
@@ -185,22 +185,22 @@ L.Control.Menubar = L.Control.extend({
 					{uno: '.uno:JumpUpThisLevel'},
 					{uno: '.uno:ContinueNumbering'}]},
 				{type: 'separator'},
+				{uno: '.uno:FormatPaintbrush'},
+				{uno: '.uno:ResetAttributes'},
+				{type: 'separator'},
 				{uno: '.uno:FontDialog'},
 				{uno: '.uno:ParagraphDialog'},
 				{uno: '.uno:OutlineBullet'},
+				{type: 'separator'},
 				{uno: '.uno:PageDialog'},
-				{uno: '.uno:EditRegion'},
 				{uno: '.uno:TitlePageDialog'},
+				{uno: '.uno:FormatColumns'},
+				{uno: '.uno:Watermark'},
+				{uno: '.uno:EditRegion'},
 				{type: 'separator'},
 				{uno: '.uno:TransformDialog'},
 				{uno: '.uno:FormatLine'},
-				{uno: '.uno:FormatArea'},
-				{type: 'separator'},
-				{uno: '.uno:Watermark'},
-				{type: 'separator'},
-				{uno: '.uno:FormatColumns'},
-				{type: 'separator'},
-				{uno: '.uno:ResetAttributes'}
+				{uno: '.uno:FormatArea'}
 			]},
 			{name: _UNO('.uno:TableMenu', 'text'), type: 'menu', menu: [
 				{uno: '.uno:InsertTable'},
@@ -219,7 +219,12 @@ L.Control.Menubar = L.Control.extend({
 					{uno: '.uno:EntireRow'},
 					{uno: '.uno:EntireColumn'},
 					{uno: '.uno:EntireCell'}]},
+				{type: 'separator'},
 				{uno: '.uno:MergeCells'},
+				{uno: '.uno:SplitCell'},
+				{type: 'separator'},
+				{uno: '.uno:HeadingRowsRepeat'},
+				{uno: '.uno:RowSplit'},
 				{type: 'separator'},
 				{uno: '.uno:TableDialog'}
 			]},
@@ -236,10 +241,12 @@ L.Control.Menubar = L.Control.extend({
 						{name: _('None (Do not check spelling)'), id: 'nonelanguage', uno: '.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]}
 				]},
 				{uno: '.uno:WordCountDialog'},
-				{uno: '.uno:LineNumberingDialog'},
 				{type: 'separator'},
 				{name: _UNO('.uno:AutoFormatMenu', 'text'), type: 'menu', menu: [
-					{uno: '.uno:OnlineAutoFormat'}]}
+					{uno: '.uno:OnlineAutoFormat'}]},
+				{type: 'separator'},
+				{uno: '.uno:ChapterNumberingDialog'},
+				{uno: '.uno:FootnoteDialog'},
 			]},
 			{name: _UNO('.uno:HelpMenu', 'text'), id: 'help', type: 'menu', menu: [
 				{name: _('Online Help'), id: 'online-help', type: 'action', iosapp: false},
diff --git a/loleaflet/src/unocommands.js b/loleaflet/src/unocommands.js
index cfbd2d114f..96a887798e 100644
--- a/loleaflet/src/unocommands.js
+++ b/loleaflet/src/unocommands.js
@@ -219,6 +219,8 @@ var unoCommandsArray = {
 	LayoutStatus:{presentation:{menu:_('Layout'),},},
 	LeftPara:{global:{context:_('Align Left'),menu:_('Left'),},},
 	LineNumberingDialog:{text:{menu:_('~Line Numbering...'),},},
+	ChapterNumberingDialog:{text:{menu:_('Chapter ~Numbering...'),},},
+	FootnoteDialog:{text:{menu:_('F~ootnote or Endnote...'),},},
 	MasterSlidesPanel:{presentation:{menu:_('Master Slides'),},},
 	MergeCells:{presentation:{menu:_('Merge Cells'),},spreadsheet:{menu:_('Merge Cells'),},text:{menu:_('Merge Cells'),},},
 	ModifyPage:{presentation:{menu:_('Slide ~Layout'),},},
@@ -326,6 +328,8 @@ var unoCommandsArray = {
 	TableInsertMenu:{global:{menu:_('~Insert'),},},
 	TableMenu:{global:{menu:_('T~able'),},},
 	TableSelectMenu:{text:{menu:_('~Select'),},},
+	HeadingRowsRepeat:{text:{menu:_('Header Rows Repeat Across Pages'),},},
+	RowSplit:{text:{menu:_('Row to ~Break Across Pages'),},},
 	TaskPaneInsertPage:{presentation:{menu:_('Insert Slide'),},},
 	Text:{global:{context:_('Insert Text Box'),menu:_('~Text Box'),},},
 	TextAlign:{global:{menu:_('Alig~n'),},},