[Libreoffice-commits] core.git: cui/source

Julien Nabet serval2412 at yahoo.fr
Wed Dec 20 06:03:52 UTC 2017


 cui/source/inc/treeopt.hxx |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit cf4228fa0aaea82858f05848fe5a6a96b34405a0
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Tue Dec 19 20:53:29 2017 +0100

    Revert "Related tdf#114457: fix leak in treeopt (cui)"
    
    According to Telesto's test, it's worse than before, so let's revert
    
    This reverts commit 41981d4cb48e66b6fdb32cdc3ae65632af9593dc.
    
    Change-Id: Iba2a364160816fe981de91e51487a78bd6ebe15c
    Reviewed-on: https://gerrit.libreoffice.org/46817
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 6bb74abb86eb..274076d9d99f 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -101,12 +101,6 @@ struct OptionsNode
         for ( size_t i = 0; i < m_aLeaves.size(); ++i )
             delete m_aLeaves[i];
         m_aLeaves.clear();
-        for (auto & oneGroupLeaves : m_aGroupedLeaves)
-        {
-            for (auto const& leaf : oneGroupLeaves)
-                delete leaf;
-            oneGroupLeaves.clear();
-        }
         m_aGroupedLeaves.clear();
     }
 };


More information about the Libreoffice-commits mailing list