tdf#90982 - repair more of the conditional formatting dialog.

Change-Id: I38ea7b31b055dcd9c3d3d55fe22908295c52bf58
This commit is contained in:
Michael Meeks
2015-05-03 22:47:11 +02:00
parent c4a8c34812
commit f7bed502ff

View File

@@ -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)