diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2015-05-03 22:47:11 +0200 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-05-03 22:48:03 +0200 |
commit | f7bed502ff0dc43f5a24f8e35c5573bdd76eed65 (patch) | |
tree | 2d25d5e1336f93d52376f273d63f25391bd673cf | |
parent | c4a8c34812e3b47ed96395ea0328b658949466fe (diff) |
tdf#90982 - repair more of the conditional formatting dialog.
Change-Id: I38ea7b31b055dcd9c3d3d55fe22908295c52bf58
-rw-r--r-- | sc/source/ui/condformat/condformatdlgentry.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index aa37bdfe0bc9..943900dfeea0 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) |