[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sfx2/source

[Julien Nabet]

 sfx2/source/control/templatelocalview.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 08ae774fe92f0576691c9b0177fef45d18fd77b3
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Aug 10 21:06:43 2017 +0200

    tdf#111567: fix memleak in TemplateLocalView::insertItems
    
    Clearing mItemList at the begin of insertItems is a bad idea
    because it prevents ImplDeleteItems (called by updateItems,
    itself called at the end of insertItems) from clearing
    correctly mItemList
    See comments from bugtracker for more info
    
    (Thank you Alex for the precious info attached with memleak reports! :-))
    
    Change-Id: I04976dbb065d1369562649fc97c33f7fd599b107
    Reviewed-on: https://gerrit.libreoffice.org/40995
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 05a338159761e012c2c8779f8927b0d709b4416f)
    Reviewed-on: https://gerrit.libreoffice.org/41002
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index 6c5881422b15..2168cdd9ac59 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -777,8 +777,6 @@ bool TemplateLocalView::renameItem(ThumbnailViewItem* pItem, const OUString& sNe
 
 void TemplateLocalView::insertItems(const std::vector<TemplateItemProperties> &rTemplates, bool isRegionSelected, bool bShowCategoryInTooltip)
 {
-    mItemList.clear();
-
     std::vector<ThumbnailViewItem*> aItems(rTemplates.size());
     for (size_t i = 0, n = rTemplates.size(); i < n; ++i )
     {