[Libreoffice-commits] core.git: sw/source

[Jim Raykowski (via logerrit)]

 sw/source/uibase/utlui/glbltree.cxx |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 91ca15e3f8ae13b22531745a634459a2d9b4596a
Author:     Jim Raykowski <rayk...@gmail.com>
AuthorDate: Sat Sep 16 15:12:42 2023 -0800
Commit:     Jim Raykowski <rayk...@gmail.com>
CommitDate: Wed Sep 20 02:35:53 2023 +0200

    tdf#139923 Part A: Master Navigator: Fix Insert popup menu
    
    Makes Master Navigator content tree popup menu item 'Insert' submenu
    items set sensitivity settings work for SalInstanceMenu.
    GtkInstanceMenu doesn't seem to require additional menu declarations
    for submenu items to be able to set sensitivity.
    
    Change-Id: Ifec28429927591f80859e3b20765c59374a64faa
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156980
    Tested-by: Jenkins
    Reviewed-by: Jim Raykowski <rayk...@gmail.com>

diff --git a/sw/source/uibase/utlui/glbltree.cxx 
b/sw/source/uibase/utlui/glbltree.cxx
index 9ce80bf0f3fe..367f9a65dd2a 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -272,6 +272,7 @@ IMPL_LINK(SwGlobalTree, CommandHdl, const CommandEvent&, 
rCEvt, bool)
     {
         std::unique_ptr<weld::Builder> 
xBuilder(Application::CreateBuilder(m_xTreeView.get(), 
"modules/swriter/ui/mastercontextmenu.ui"));
         std::unique_ptr<weld::Menu> xPopup = xBuilder->weld_menu("navmenu");
+        std::unique_ptr<weld::Menu> xSubPopup = 
xBuilder->weld_menu("insertmenu");
 
         const MenuEnableFlags nEnableFlags = GetEnableFlags();
 
@@ -280,10 +281,10 @@ IMPL_LINK(SwGlobalTree, CommandHdl, const CommandEvent&, 
rCEvt, bool)
         xPopup->set_sensitive("editlink", bool(nEnableFlags & 
MenuEnableFlags::EditLink));
 
         //disabling if applicable
-        xPopup->set_sensitive("insertindex", bool(nEnableFlags & 
MenuEnableFlags::InsertIdx ));
-        xPopup->set_sensitive("insertfile", bool(nEnableFlags & 
MenuEnableFlags::InsertFile));
-        xPopup->set_sensitive("insertnewfile", bool(nEnableFlags & 
MenuEnableFlags::InsertFile));
-        xPopup->set_sensitive("inserttext", bool(nEnableFlags & 
MenuEnableFlags::InsertText));
+        xSubPopup->set_sensitive("insertindex", bool(nEnableFlags & 
MenuEnableFlags::InsertIdx ));
+        xSubPopup->set_sensitive("insertfile", bool(nEnableFlags & 
MenuEnableFlags::InsertFile));
+        xSubPopup->set_sensitive("insertnewfile", bool(nEnableFlags & 
MenuEnableFlags::InsertFile));
+        xSubPopup->set_sensitive("inserttext", bool(nEnableFlags & 
MenuEnableFlags::InsertText));
 
         xPopup->set_sensitive("update", bool(nEnableFlags & 
MenuEnableFlags::Update));
         xPopup->set_sensitive("insert", bool(nEnableFlags & 
MenuEnableFlags::InsertIdx));