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

[Michael Meeks]

 sc/source/ui/condformat/condformatdlgentry.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit f7bed502ff0dc43f5a24f8e35c5573bdd76eed65
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Sun May 3 22:47:11 2015 +0200

    tdf#90982 - repair more of the conditional formatting dialog.
    
    Change-Id: I38ea7b31b055dcd9c3d3d55fe22908295c52bf58

diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index aa37bdf..943900d 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -1562,6 +1562,9 @@ ScIconSetFrmtEntry::~ScIconSetFrmtEntry()
 
 void ScIconSetFrmtEntry::dispose()
 {
+    for (auto it = maEntries.begin(); it != maEntries.end(); ++it)
+        it->disposeAndClear();
+    maEntries.clear();
     maLbColorFormat.disposeAndClear();
     maLbIconSetType.disposeAndClear();
     ScCondFrmtEntry::dispose();
@@ -1582,6 +1585,9 @@ IMPL_LINK_NOARG( ScIconSetFrmtEntry, IconSetTypeHdl )
 
     sal_Int32 nPos = maLbIconSetType->GetSelectEntryPos();
     sal_uInt32 nElements = pMap[nPos].nElements;
+
+    for (auto it = maEntries.begin(); it != maEntries.end(); ++it)
+        it->disposeAndClear();
     maEntries.clear();
 
     for(size_t i = 0; i < nElements; ++i)