Kaydet (Commit) 5a38ae7b authored tarafından Julien Nabet's avatar Julien Nabet

Revert "Related tdf#114455: fix mem leak on olmenu (sw)"

After having tested it on MacOs, it seems it doesn't help

This reverts commit 2f9360b5.

Change-Id: I6de52c9ae5a43a659d28d72bfc742ed4b5cec5b0
Reviewed-on: https://gerrit.libreoffice.org/46816Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
üst 0545c1ad
...@@ -600,7 +600,6 @@ void SwSpellPopup::checkRedline() ...@@ -600,7 +600,6 @@ void SwSpellPopup::checkRedline()
{ {
aSet.Put(SfxVoidItem(nWhich)); aSet.Put(SfxVoidItem(nWhich));
} }
m_pSh->GetView().GetState(aSet); m_pSh->GetView().GetState(aSet);
// Enable/disable items based on if the which id of the void items are // Enable/disable items based on if the which id of the void items are
...@@ -616,11 +615,7 @@ void SwSpellPopup::checkRedline() ...@@ -616,11 +615,7 @@ void SwSpellPopup::checkRedline()
nId = m_nRedlineNextId; nId = m_nRedlineNextId;
else if (nWhich == FN_REDLINE_PREV_CHANGE) else if (nWhich == FN_REDLINE_PREV_CHANGE)
nId = m_nRedlinePrevId; nId = m_nRedlinePrevId;
auto valueWhich = aSet.Get(nWhich).Which(); m_xPopupMenu->EnableItem(nId, aSet.Get(nWhich).Which());
m_xPopupMenu->EnableItem(nId, valueWhich);
// Remove the value when we disable item to avoid mem leak
if (!valueWhich)
aSet.ClearItem(nWhich);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment