sw/source/uibase/utlui/content.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit fc6744603ab8bb5a00c4f97435b5e509bdeaeb94
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Sep 14 10:04:28 2016 +0100
Resolves: tdf#101859 dispose unused popupmenu before dtor
Change-Id: I097a342f29aa88ab2d0a6a80b9ac6e1e9a5e3d5a
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index 0479e72..b495034 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1097,6 +1097,7 @@ VclPtr<PopupMenu> SwContentTree::CreateContextMenu()
VclPtrInstance<PopupMenu> pSubPop2;
VclPtrInstance<PopupMenu> pSubPop3;
VclPtrInstance<PopupMenu> pSubPop4; // Edit
+ bool bSubPop4 = false;
for(int i = 1; i <= MAXLEVEL; ++i)
{
@@ -1172,7 +1173,6 @@ VclPtr<PopupMenu> SwContentTree::CreateContextMenu()
if(!bReadonly && (bEditable || bDeletable))
{
- bool bSubPop4 = false;
if(ContentTypeId::INDEX == nContentType)
{
bSubPop4 = true;
@@ -1247,8 +1247,9 @@ VclPtr<PopupMenu> SwContentTree::CreateContextMenu()
pPop->SetPopupMenu( 1, pSubPop1 );
pPop->SetPopupMenu( 2, pSubPop2 );
pPop->SetPopupMenu( 3, pSubPop3 );
+ if (!bSubPop4)
+ pSubPop4.disposeAndClear();
return pPop;
-
}
// Indentation for outlines (and sections)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
