[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/control/Control.Menubar.js |    2 ++
 loleaflet/src/unocommands.js             |    1 +
 2 files changed, 3 insertions(+)

New commits:
commit e66d810cb147874a2bba55ee7bcfe8af5d503d7f
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Tue May 14 13:53:55 2019 +0200
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue May 14 15:00:44 2019 +0200

    Revert "loleaflet: disable Watermarking dialog"
    
    This reverts commit e1b8692c7d32c51b1c3e9824b3ece1966851dc49. This
    commit was distro/collabora/collabora-online-4-only and now that the
    root cause is fixed in core.git 93abdf39b01bb7b404dc09ef37369a4350fb0d10
    (sw lok: assume no windows in SwLayoutFrame::PaintSwFrame(),
    2019-05-14), it is no longer necessary.
    
    Change-Id: I65eb222e68fa5769513cffd50a9210e95d44a5c7
    Reviewed-on: https://gerrit.libreoffice.org/72286
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 676cf8047..53febfd85 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -185,6 +185,8 @@ L.Control.Menubar = L.Control.extend({
 				{uno: '.uno:PageDialog'},
 				{uno: '.uno:EditRegion'},
 				{type: 'separator'},
+				{uno: '.uno:Watermark'},
+				{type: 'separator'},
 				{uno: '.uno:FormatColumns'},
 				{type: 'separator'},
 				{uno: '.uno:ResetAttributes'}
diff --git a/loleaflet/src/unocommands.js b/loleaflet/src/unocommands.js
index ebbce32de..7a0ad5f65 100644
--- a/loleaflet/src/unocommands.js
+++ b/loleaflet/src/unocommands.js
@@ -255,6 +255,7 @@ var unoCommandsArray = {
 	UpdateCurIndex:{text:{context:_('Update index'),menu:_('Current ~Index'),},},
 	Validation:{spreadsheet:{menu:_('~Validity...'),},},
 	ViewMenu:{global:{menu:_('~View'),},},
+	Watermark:{text:{menu:_('Watermark...'),},},
 	WordCountDialog:{text:{menu:_('~Word Count'),},},
 	WrapAnchorOnly:{text:{menu:_('~First Paragraph'),},},
 	WrapContour:{text:{menu:_('~Contour'),},},