[Libreoffice-commits] online.git: loleaflet/src loleaflet/unocommands.js test/data

[Andras Timar]

 loleaflet/src/control/Control.Menubar.js |   19 +++++++++++++------
 loleaflet/unocommands.js                 |    8 +++++++-
 test/data/empty.ods                      |binary
 3 files changed, 20 insertions(+), 7 deletions(-)

New commits:
commit b18c87f7c9d68a1ecada51ee7bc75d280deebb2b
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Jan 8 22:55:29 2018 +0100

    Insert rows/columns belong to Sheet menu
    
    Change-Id: I4eb8f8e6fc73e8c0f2985172ef303c9895ac1afd

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 8ef8ad31..f9fe3daa 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -315,9 +315,6 @@ L.Control.Menubar = L.Control.extend({
 				{name: _UNO('.uno:InsertGraphic', 'spreadsheet'), id: 'insertgraphic', type: 'action'},
 				{name: _UNO('.uno:InsertAnnotation', 'spreadsheet'), id: 'insertcomment', type: 'action'},
 				{type: 'separator'},
-				{uno: '.uno:InsertRows'},
-				{uno: '.uno:InsertColumns'},
-				{type: 'separator'},
 				{uno: '.uno:InsertSymbol'}
 			]},
 			{name: _UNO('.uno:FormatMenu', 'spreadsheet'), type: 'menu', menu: [
@@ -325,11 +322,21 @@ L.Control.Menubar = L.Control.extend({
 				{uno: '.uno:FormatCellDialog'}
 			]},
 			{name: _UNO('.uno:SheetMenu', 'spreadsheet'), type: 'menu', menu: [
-				{uno: '.uno:InsertRows'},
-				{uno: '.uno:InsertColumns'},
+				{name: _UNO('.uno:InsertRowsMenu', 'spreadsheet'), type: 'menu', menu: [
+					{uno: '.uno:InsertRowsBefore'},
+					{uno: '.uno:InsertRowsAfter'}]},
+				{name: _UNO('.uno:InsertColumnsMenu', 'spreadsheet'), type: 'menu', menu: [
+					{uno: '.uno:InsertColumnsBefore'},
+					{uno: '.uno:InsertColumnsAfter'}]},
+				{name: _UNO('.uno:InsertBreakMenu', 'spreadsheet'), type: 'menu', menu: [
+					{uno: '.uno:InsertRowBreak'},
+					{uno: '.uno:InsertColumnBreak'}]},
 				{type: 'separator'},
 				{uno: '.uno:DeleteRows'},
-				{uno: '.uno:DeleteColumns'}
+				{uno: '.uno:DeleteColumns'},
+				{name: _UNO('.uno:DelBreakMenu', 'spreadsheet'), type: 'menu', menu: [
+					{uno: '.uno:DeleteRowbreak'},
+					{uno: '.uno:DeleteColumnbreak'}]}
 			]},
 			{name: _UNO('.uno:DataMenu', 'spreadsheet'), type: 'menu', menu: [
 				{uno: '.uno:DataSort'},
diff --git a/loleaflet/unocommands.js b/loleaflet/unocommands.js
index beaafaf5..9d8175cb 100644
--- a/loleaflet/unocommands.js
+++ b/loleaflet/unocommands.js
@@ -42,10 +42,13 @@ var unoCommandsArray = {
 	DecrementSubLevels:{text:{menu:_('Demote One Level With Subpoints'),},},
 	DefaultBullet:{global:{context:_('Toggle Bulleted List'),menu:_('~Bulleted List'),},},
 	DefaultNumbering:{global:{context:_('Toggle Numbered List'),menu:_('~Numbered List'),},},
+	DelBreakMenu:{spreadsheet:{menu:_('Delete Page ~Break'),},},
 	DeleteAllNotes:{global:{menu:_('Delete All Comments'),},spreadsheet:{menu:_('Delete All Comments'),},},
 	DeleteAuthor:{global:{menu:_('Delete All Comments by This Author'),},},
+	DeleteColumnbreak:{spreadsheet:{menu:_('~Column Break'),},},
 	DeleteColumns:{presentation:{context:_('Delete Column'),menu:_('~Columns'),},spreadsheet:{menu:_('Delete Columns'),},text:{menu:_('~Columns'),},},
 	DeleteComment:{global:{menu:_('Delete Comment'),},},
+	DeleteRowbreak:{spreadsheet:{menu:_('~Row Break'),},},
 	DeleteRows:{presentation:{context:_('Delete Row'),menu:_('~Rows'),},spreadsheet:{menu:_('Delete Rows'),},text:{menu:_('~Rows'),},},
 	DeleteSlide:{presentation:{menu:_('~Delete Slide'),},},
 	DeleteTable:{text:{menu:_('~Table'),},},
@@ -81,10 +84,11 @@ var unoCommandsArray = {
 	IncrementLevel:{text:{menu:_('Promote One Level'),},},
 	IncrementSubLevels:{text:{menu:_('Promote One Level With Subpoints'),},},
 	InsertAnnotation:{global:{context:_('Insert Comment'),menu:_('Comme~nt'),},presentation:{menu:_('Comme~nt'),},spreadsheet:{context:_('Insert Co~mment'),menu:_('Comm~ent'),},},
+	InsertBreakMenu:{spreadsheet:{menu:_('Insert Page ~Break'),},},
 	InsertColumnBreak:{spreadsheet:{menu:_('~Column Break'),},text:{menu:_('Insert Column Break'),},},
-	InsertColumns:{presentation:{menu:_('Insert Column'),},spreadsheet:{menu:_('Columns ~Left'),},text:{menu:_('Insert Column'),},},
 	InsertColumnsAfter:{presentation:{menu:_('Insert Column Right'),},spreadsheet:{context:_('Insert Columns ~Right'),menu:_('Columns ~Right'),},text:{menu:_('Columns R~ight'),},},
 	InsertColumnsBefore:{presentation:{menu:_('Insert Column Left'),},spreadsheet:{context:_('Insert Columns ~Left'),menu:_('Columns ~Left'),},text:{menu:_('Columns ~Left'),},},
+	InsertColumnsMenu:{spreadsheet:{menu:_('Insert Co~lumns'),},},
 	InsertEndnote:{text:{menu:_('~Endnote'),},},
 	InsertFootnote:{text:{context:_('Insert Footnote'),menu:_('~Footnote'),},},
 	InsertGraphic:{global:{context:_('Insert Image...'),menu:_('~Image...'),},},
@@ -99,9 +103,11 @@ var unoCommandsArray = {
 	InsertPageHeader:{text:{menu:_('He~ader'),},},
 	InsertPagebreak:{text:{menu:_('~Page Break'),},},
 	InsertRLM:{global:{menu:_('~Right-to-left mark'),},},
+	InsertRowBreak:{spreadsheet:{menu:_('~Row Break'),},},
 	InsertRows:{presentation:{menu:_('Insert Row'),},spreadsheet:{menu:_('Rows ~Above'),},text:{menu:_('Insert Row'),},},
 	InsertRowsAfter:{presentation:{menu:_('Insert Row Below'),},spreadsheet:{context:_('Insert Rows ~Below'),menu:_('Rows ~Below'),},text:{menu:_('Rows ~Below'),},},
 	InsertRowsBefore:{presentation:{menu:_('Insert Row Above'),},spreadsheet:{context:_('Insert Rows ~Above'),menu:_('Rows ~Above'),},text:{menu:_('Rows ~Above'),},},
+	InsertRowsMenu:{spreadsheet:{menu:_('Insert ~Rows'),},},
 	InsertSlide:{presentation:{menu:_('~New Slide'),},},
 	InsertSoftHyphen:{global:{menu:_('S~oft hyphen'),},},
 	InsertSymbol:{global:{context:_('Insert Special Character'),menu:_('S~pecial Character...'),},},
diff --git a/test/data/empty.ods b/test/data/empty.ods
index 86414ec0..78fc7b11 100755
Binary files a/test/data/empty.ods and b/test/data/empty.ods differ