[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sd/sdi sd/source sd/uiconfig
Miklos Vajna (via logerrit)
logerrit at kemper.freedesktop.org
Fri Jun 26 06:52:23 UTC 2020
sd/sdi/_drvwsh.sdi | 7 +++++++
sd/source/ui/view/drviewse.cxx | 1 +
sd/uiconfig/sdraw/menubar/menubar.xml | 1 +
3 files changed, 9 insertions(+)
New commits:
commit 9d3147beb74812393858cbd8d9d1297053d23099
Author: Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Jun 4 13:54:57 2020 +0200
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Jun 26 08:51:48 2020 +0200
sd signature line: add initial menu item / UNO command
Signature lines already work in Writer and Calc, this starts adding it
to Draw.
The current code is similar to SID_DRAW_RECT, just the implementation
for the UNO command is allowed in read-only mode, to be used for PDFs
opened for signing.
Also allow SID_OBJECT_SELECT is read-only mode: selecting objects makes
sense to allow (usually already works on the UI) and this is needed to
allow finishing the "create" mode in a read-only view.
(cherry picked from commit ff56f77c06834713945b4048902fc6518655ebaa)
Change-Id: Icccb9ae1cd58eff1a7c2c36df1548ea7b412c246
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97170
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index dd64ae35cd4e..efcfe0f51492 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -1315,6 +1315,7 @@ interface DrawView
ExecMethod = FuPermanent ;
StateMethod = GetMenuState ;
Export = FALSE ;
+ ReadOnlyDoc = TRUE ;
]
// Begin FormSlots
@@ -2591,6 +2592,12 @@ interface DrawView
ExecMethod = FuPermanent ;
StateMethod = GetMenuState ;
]
+ SID_INSERT_SIGNATURELINE
+ [
+ ExecMethod = FuPermanent ;
+ StateMethod = GetMenuState ;
+ ReadOnlyDoc = TRUE ;
+ ]
SID_AVMEDIA_PLAYER // ole : yes, status : ?
[
ExecMethod = FuTemporary ;
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 7ba9914706a7..5b41c8093289 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -449,6 +449,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
case SID_CONNECTOR_LINES_CIRCLE_START:
case SID_CONNECTOR_LINES_CIRCLE_END:
case SID_CONNECTOR_LINES_CIRCLES:
+ case SID_INSERT_SIGNATURELINE:
{
SetCurrentFunction( FuConstructRectangle::Create( this, GetActiveWindow(), mpDrawView.get(), GetDoc(), rReq, bPermanent ) );
rReq.Done();
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index 87d81f5446be..f1373d4470bc 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -71,6 +71,7 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:Signature" menu:style="text"/>
<menu:menuitem menu:id=".uno:SignPDF" menu:style="text"/>
+ <menu:menuitem menu:id=".uno:InsertSignatureLine" menu:style="text"/>
</menu:menupopup>
</menu:menu>
<menu:menuseparator/>
More information about the Libreoffice-commits
mailing list