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

Pranam Lashkari (via logerrit) logerrit at kemper.freedesktop.org
Fri May 8 18:04:19 UTC 2020


 loleaflet/src/control/Control.ContextMenu.js     |    2 +-
 loleaflet/src/control/Control.JSDialogBuilder.js |    1 +
 loleaflet/src/unocommands.js                     |    1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 4329826d91cfd1e4103e689352e429754a2067cd
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Fri May 8 14:12:41 2020 +0530
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri May 8 20:04:02 2020 +0200

    leaflet: clear formatting option enabled for impress mobile
    
    Change-Id: I8be2baa555174d22bb9ff7836ad452a4fa8d24b9
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93704
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/src/control/Control.ContextMenu.js b/loleaflet/src/control/Control.ContextMenu.js
index 3a429464d..82bd501c5 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -53,7 +53,7 @@ L.Control.ContextMenu = L.Control.extend({
 			spreadsheet: ['MergeCells', 'SplitCell', 'RecalcPivotTable', 'FormatCellDialog',
 				          'ShowNote', 'DeleteNote', 'SetAnchorToCell', 'SetAnchorToCellResize'],
 
-			presentation: [],
+			presentation: ['SetDefault'],
 			drawing: []
 		},
 		// UNOCOMMANDS_EXTRACT_END <- don't remove this line, it's used by unocommands.py
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index 9c99e31f5..a72fe2959 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -172,6 +172,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 		this._toolitemHandlers['.uno:Color'] = this._colorControl;
 		this._toolitemHandlers['.uno:FillColor'] = this._colorControl;
 		this._toolitemHandlers['.uno:ResetAttributes'] = this._clearFormattingControl;
+		this._toolitemHandlers['.uno:SetDefault'] = this._clearFormattingControl;
 
 		this._currentDepth = 0;
 	},
diff --git a/loleaflet/src/unocommands.js b/loleaflet/src/unocommands.js
index 2149e8d9c..608dfd997 100644
--- a/loleaflet/src/unocommands.js
+++ b/loleaflet/src/unocommands.js
@@ -266,6 +266,7 @@ var unoCommandsArray = {
 	SetAnchorToFrame:{text:{menu:_('To ~Frame'),},},
 	SetAnchorToPage:{spreadsheet:{menu:_('To P~age'),},text:{menu:_('To P~age'),},},
 	SetAnchorToPara:{text:{menu:_('To ~Paragraph'),},},
+	SetDefault:{global:{menu:_('Clear ~Direct Formatting'),},},
 	SetLanguageAllTextMenu:{global:{menu:_('For All Text'),},},
 	SetLanguageParagraphMenu:{global:{menu:_('For Paragraph'),},},
 	SetLanguageSelectionMenu:{global:{menu:_('For Selection'),},},


More information about the Libreoffice-commits mailing list