incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zhan...@apache.org
Subject svn commit: r1380109 - in /incubator/ooo/trunk/main/sd/source/ui: slidesorter/shell/SlideSorterViewShell.cxx toolpanel/ToolPanelViewShell.cxx
Date Mon, 03 Sep 2012 01:55:53 GMT
Author: zhangjf
Date: Mon Sep  3 01:55:53 2012
New Revision: 1380109

URL: http://svn.apache.org/viewvc?rev=1380109&view=rev
Log:
#i120663#, FrameView object created in SlideSorterViewShell and ToolPanelViewShell constructor
is never released

Found by: zhangjf 
Patch by: zhangjf
Review by: zhangjf

Modified:
    incubator/ooo/trunk/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
    incubator/ooo/trunk/main/sd/source/ui/toolpanel/ToolPanelViewShell.cxx

Modified: incubator/ooo/trunk/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx?rev=1380109&r1=1380108&r2=1380109&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx (original)
+++ incubator/ooo/trunk/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx Mon Sep
 3 01:55:53 2012
@@ -169,6 +169,8 @@ SlideSorterViewShell::~SlideSorterViewSh
 		(void)e;
 		DBG_ERROR("sd::SlideSorterViewShell::~SlideSorterViewShell(), exception caught!" );
 	}
+
+	GetFrameView()->Disconnect(); // i120663, release the FrameView object 
 }
 
 

Modified: incubator/ooo/trunk/main/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/source/ui/toolpanel/ToolPanelViewShell.cxx?rev=1380109&r1=1380108&r2=1380109&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sd/source/ui/toolpanel/ToolPanelViewShell.cxx (original)
+++ incubator/ooo/trunk/main/sd/source/ui/toolpanel/ToolPanelViewShell.cxx Mon Sep  3 01:55:53
2012
@@ -550,6 +550,8 @@ ToolPanelViewShell::~ToolPanelViewShell(
     // disposed/destroyed, too
     mpImpl.reset();
     GetViewShellBase().GetViewShellManager()->RemoveSubShellFactory(this, mpSubShellManager);
+
+    GetFrameView()->Disconnect(); // i120663, release the FrameView object
 }
 
 // ---------------------------------------------------------------------------------------------------------------------



Mime
View raw message