sd/source/ui/dlg/navigatr.cxx | 3 +++
sw/source/uibase/utlui/content.cxx | 3 +++
vcl/jsdialog/enabled.cxx | 2 ++
3 files changed, 8 insertions(+)
New commits:
commit 69747e3718a34efc5204e40bfde0ecb133a1e3b3
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Fri Jul 4 13:27:40 2025 +0000
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Fri Jul 4 16:35:04 2025 +0200
jsdialog: disable right click menu in sd & sw navigator
The menu wasn't available in the LOK case due to missing JSDialog
enablement and doesn't seems to be useful yet.
It might cause problems:
non-async dialog is opened in the core but not visible
and user cannot type anything
Change-Id: Ic92f0a38df615bec8ce553f6fad78eb0a0e459bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187400
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 69ad356a59d0..e0af090c7cb3 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -257,6 +257,9 @@ IMPL_STATIC_LINK_NOARG(SdNavigatorWin, MouseReleaseHdl,
const MouseEvent&, bool)
IMPL_LINK(SdNavigatorWin, CommandHdl, const CommandEvent&, rCEvt, bool)
{
+ if (comphelper::LibreOfficeKit::isActive())
+ return false;
+
if (NavDocInfo* pInfo = GetDocInfo(); !pInfo || !pInfo->IsActive())
return false;
if (rCEvt.GetCommand() != CommandEventId::ContextMenu)
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index 8d90e3e0e79e..cc8929a4b8ef 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1617,6 +1617,9 @@ IMPL_LINK(SwContentTree, CommandHdl, const CommandEvent&,
rCEvt, bool)
if (rCEvt.GetCommand() != CommandEventId::ContextMenu)
return false;
+ if (comphelper::LibreOfficeKit::isActive())
+ return false;
+
grab_focus();
// select clicked entry or limit selection to root entry if needed
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 14b183bcd3ac..c466e5a3bc0a 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -32,6 +32,8 @@ constexpr auto IgnoredList
{ u"svt/ui/tabbuttons.ui" },
{ u"svx/ui/toolbarpopover.ui" },
{ u"modules/scalc/ui/dropmenu.ui"}, // Calc -> Navigator -> right click
+ { u"modules/sdraw/ui/navigatorcontextmenu.ui" }, // Impress ->
Navigator -> right click
+ { u"modules/swriter/ui/navigatorcontextmenu.ui" }, // Writer ->
Navigator -> right click
});
// ========== MOBILE DIALOGS =================================================
//
