sw/source/uibase/lingu/olmenu.cxx | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
New commits:
commit 5a38ae7bb491df71bfc1678811d89c3064fd8408
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Tue Dec 19 20:48:43 2017 +0100
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 2f9360b58a358fefb86f474464e53f1ea5ffb52b.
Change-Id: I6de52c9ae5a43a659d28d72bfc742ed4b5cec5b0
Reviewed-on: https://gerrit.libreoffice.org/46816
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/sw/source/uibase/lingu/olmenu.cxx
b/sw/source/uibase/lingu/olmenu.cxx
index f13b5f1e8247..879a2c93f5c2 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -600,7 +600,6 @@ void SwSpellPopup::checkRedline()
{
aSet.Put(SfxVoidItem(nWhich));
}
-
m_pSh->GetView().GetState(aSet);
// Enable/disable items based on if the which id of the void items are
@@ -616,11 +615,7 @@ void SwSpellPopup::checkRedline()
nId = m_nRedlineNextId;
else if (nWhich == FN_REDLINE_PREV_CHANGE)
nId = m_nRedlinePrevId;
- auto valueWhich = 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);
+ m_xPopupMenu->EnableItem(nId, aSet.Get(nWhich).Which());
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
