From 37d3e978c95a99bffda6d6d2c6b76cbf7521b185 Mon Sep 17 00:00:00 2001 From: "Armin Le Grand (allotropia)" Date: Thu, 3 Oct 2024 20:24:53 +0200 Subject: tdf#163124: Show correct PopUp when SlideShow running When the non-native SlideShow in DrawViewShell::Command in drviews4.cxx (see !bNativeShow) is active, the above checks/actions have to be done to make the EditView work normally, but use the "page" standard context menu fallback only when SlideShow is not running to get the SlideShow popup menu - as expected when SlideShow is running. Change-Id: I6e3bc69023218fc0decce61581ddbc498e00d39c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174437 Reviewed-by: Armin Le Grand Tested-by: Jenkins --- sd/source/ui/view/drviews4.cxx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'sd/source/ui/view/drviews4.cxx') diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index b0ce3a71e0ca..776546ed9cfc 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -795,8 +795,13 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) } // nothing selected - else + else if (!SlideShow::IsRunning(GetViewShellBase())) { + // tdf#163124 this is the non-native SlideShow (see !bNativeShow), + // thus the above checks/actions have to be done to make the + // EditView work normally, but use the "page" standard context menu + // fallback only when SlideShow is not running to get the + // SlideShow popup menu - as expected when SlideShow is running aPopupId = "page"; } } -- cgit