summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-02-23 17:15:04 +0000
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-02-28 11:00:16 +0000
commit4024318a1d656388f3417a0f74794ccf05b3509a (patch)
tree4d0279cad2b5ec6e6fe56e115517bdbde785ddff
parent4d31e570f69fd8ec5294ea2aea019b57637bccb9 (diff)
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@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--sw/source/uibase/utlui/content.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index dd8a2bfbf50d..ed5cb8159904 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 );