[Libreoffice-commits] online.git: loleaflet/src

[Muhammet Kara (via logerrit)]

 loleaflet/src/control/Control.ContextMenu.js |    4 ++--
 loleaflet/src/control/Control.Menubar.js     |    5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 166ab80248b00cb5b436bb6da354ca66a5a5434a
Author:     Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Sat Jun 29 17:43:28 2019 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Sat Jun 29 17:26:04 2019 +0200

    Add FormatArea dialog to Format and context menus
    
    Change-Id: I16ed30306e717a8676b1b02b68a65805a497c791
    Reviewed-on: https://gerrit.libreoffice.org/74893
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>
    Tested-by: Muhammet Kara <muhammet.kara at collabora.com>
    (cherry picked from commit ec58a56ac8abad0111004e22cb789bdecf0cfaa2)
    Reviewed-on: https://gerrit.libreoffice.org/74896

diff --git a/loleaflet/src/control/Control.ContextMenu.js b/loleaflet/src/control/Control.ContextMenu.js
index 0bc64c95f..196eef936 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -27,7 +27,7 @@ L.Control.ContextMenu = L.Control.extend({
 					  'WrapMenu', 'WrapOff', 'WrapOn', 'WrapIdeal', 'WrapLeft', 'WrapRight', 'WrapThrough',
 					  'WrapThroughTransparent', 'WrapContour', 'WrapAnchorOnly',
 					  'ArrangeFrameMenu', 'ArrangeMenu', 'BringToFront', 'ObjectForwardOne', 'ObjectBackOne', 'SendToBack',
-					  'RotateMenu', 'RotateLeft', 'RotateRight'],
+					  'RotateMenu', 'RotateLeft', 'RotateRight', 'FormatArea'],
 
 			text: ['TableInsertMenu',
 				   'InsertRowsBefore', 'InsertRowsAfter', 'InsertColumnsBefore', 'InsertColumnsAfter',
@@ -39,7 +39,7 @@ L.Control.ContextMenu = L.Control.extend({
 
 			spreadsheet: ['MergeCells', 'SplitCell', 'RecalcPivotTable', 'FormatCellDialog'],
 
-			presentation: ['TransformDialog', 'FormatLine', 'FormatArea'],
+			presentation: ['TransformDialog', 'FormatLine'],
 			drawing: []
 		}
 		// UNOCOMMANDS_EXTRACT_END <- don't remove this line, it's used by unocommands.py
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index bb2e32c7f..90dd04315 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -182,6 +182,8 @@ L.Control.Menubar = L.Control.extend({
 				{uno: '.uno:OutlineBullet'},
 				{uno: '.uno:PageDialog'},
 				{type: 'separator'},
+				{uno: '.uno:FormatArea'},
+				{type: 'separator'},
 				{uno: '.uno:Watermark'},
 				{type: 'separator'},
 				{uno: '.uno:FormatColumns'},
@@ -364,6 +366,9 @@ L.Control.Menubar = L.Control.extend({
 				{uno: '.uno:ResetAttributes'},
 				{uno: '.uno:FormatCellDialog'},
 				{uno: '.uno:PageFormatDialog'},
+				{type: 'separator'},
+				{uno: '.uno:FormatArea'},
+				{type: 'separator'},
 				{name: _UNO('.uno:ConditionalFormatMenu', 'spreadsheet'), type: 'menu', menu: [
 					{uno: '.uno:ConditionalFormatDialog'},
 					{uno: '.uno:ColorScaleFormatDialog'},