summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenry Castro <hcastro@collabora.com>2021-02-15 16:13:11 -0400
committerPedro Pinto Silva <pedro.silva@collabora.com>2021-03-08 16:51:11 +0100
commit0b9d71a55b8fe4818c4eb97f557b3b37f51a837e (patch)
tree6d644d3a453f4e97297b4a050ad2b09b5ed1965e
parentBump package version to 6.4.6-4 (diff)
downloadonline-gh-pr-2D.tar.gz
online-gh-pr-2D.zip
Revert "temporary hide VBA dialogs" gh-pr-2D
This reverts commit 05330d9f0756f263578d5f9301eea0929452eabe. Change-Id: I7c142bc71aaf5b58b7b80df55a0eed5d4169f08e Signed-off-by: Henry Castro <hcastro@collabora.com>
-rw-r--r--loleaflet/src/control/Control.Menubar.js4
-rw-r--r--loleaflet/src/control/Control.NotebookbarBuilder.js2
-rw-r--r--loleaflet/src/unocommands.js1
3 files changed, 6 insertions, 1 deletions
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index a01536694e..1aa5a6ef42 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -584,7 +584,9 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:SpellOnline'},
{name: _UNO('.uno:LanguageMenu'), type: 'menu', menu: [
{name: _('None (Do not check spelling)'), id: 'nonelanguage', uno: '.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]},
- {uno: '.uno:GoalSeekDialog'}
+ {uno: '.uno:GoalSeekDialog'},
+ {type: 'separator'},
+ {name: _UNO('.uno:RunMacro'), id: 'runmacro', type: 'action'}
]},
{name: _UNO('.uno:HelpMenu', 'spreadsheet'), id: 'help', type: 'menu', menu: [
{name: _('Online Help'), id: 'online-help', type: 'action', iosapp: false},
diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js b/loleaflet/src/control/Control.NotebookbarBuilder.js
index c0f40c33be..0896f9102f 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -679,6 +679,8 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({
{name: _('None (Do not check spelling)'), id: 'nonelanguage', uno: '.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]},
{uno: '.uno:GoalSeekDialog'},
{type: 'separator'},
+ {uno: '.uno:RunMacro'},
+ {type: 'separator'},
{name: _UNO('.uno:ConditionalFormatMenu', 'spreadsheet'), type: 'menu', menu: [
{uno: '.uno:ConditionalFormatDialog'},
{uno: '.uno:ColorScaleFormatDialog'},
diff --git a/loleaflet/src/unocommands.js b/loleaflet/src/unocommands.js
index de9feb7eba..98ae197d75 100644
--- a/loleaflet/src/unocommands.js
+++ b/loleaflet/src/unocommands.js
@@ -336,6 +336,7 @@ var unoCommandsArray = {
'RotateLeft':{text:{menu:_('Rotate 90° ~Left'),},},
'RotateMenu':{global:{menu:_('Rot~ate'),},},
'RotateRight':{text:{menu:_('Rotate 90° ~Right'),},},
+ 'RunMacro':{global:{menu:_('R~un Macro...'),},},
'SamplingDialog':{spreadsheet:{menu:_('~Sampling...'),},},
'Save':{global:{menu:_('~Save'),},},
'SaveAs':{global:{menu:_('Save ~As...'),},},