[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sw/source

[Caolán McNamara]

 sw/source/uibase/utlui/content.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4024318a1d656388f3417a0f74794ccf05b3509a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Feb 23 17:15:04 2017 +0000

    Resolves: tdf#106159 right click + left click with comments in navigator
    
    results in a disposed submenu in the menu, we need to flag with bSubPop4
    that we have inserted the submenu into the parent menu to not dispose
    it
    
    Change-Id: I5b9711c0bba750c11d64dc175efd452f4bc8f4e5
    (cherry picked from commit 58659cbaa8c955b135737bf9d77e4e57813310e5)
    Reviewed-on: https://gerrit.libreoffice.org/34590
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index dd8a2bf..ed5cb81 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1240,6 +1240,7 @@ VclPtr<PopupMenu> SwContentTree::CreateContextMenu()
         SwContentType* pType = static_cast<SwContentType*>(pEntry->GetUserData());
         if ( (pType->GetType() == ContentTypeId::POSTIT) &&  (!m_pActiveShell->GetView().GetDocShell()->IsReadOnly()) && ( pType->GetMemberCount() > 0) )
         {
+            bSubPop4 = true;
             pSubPop4->InsertItem(600, m_sPostItShow );
             pSubPop4->InsertItem(601, m_sPostItHide );
             pSubPop4->InsertItem(602, m_sPostItDelete );