[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sd/source
Samuel Mehrbrodt (via logerrit)
logerrit at kemper.freedesktop.org
Tue Dec 3 11:05:04 UTC 2019
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 7 +++++++
1 file changed, 7 insertions(+)
New commits:
commit ba7aa8b9282631623e64c64072399f9034f59f18
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Tue Dec 3 07:40:03 2019 +0100
Commit: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Tue Dec 3 12:03:20 2019 +0100
Disable slide copy/cut when LockContentExtraction is set
Change-Id: I7bf9ba907a152fab81a9472bc7baf00331753828
Reviewed-on: https://gerrit.libreoffice.org/84291
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 43db80c7ec45..99be5ad168bb 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -763,6 +763,13 @@ void SlotManager::GetClipboardState ( SfxItemSet& rSet)
}
}
+ ViewShellBase* pBase = mrSlideSorter.GetViewShellBase();
+ if (pBase && pBase->isContentExtractionLocked())
+ {
+ rSet.DisableItem(SID_COPY);
+ rSet.DisableItem(SID_CUT);
+ }
+
// Cut, copy, and delete page are disabled when there is no selection.
if (!(rSet.GetItemState(SID_CUT) == SfxItemState::DEFAULT
|| rSet.GetItemState(SID_COPY) == SfxItemState::DEFAULT
More information about the Libreoffice-commits
mailing list