From 7e7b9652f44f01fbaf5bc3fde454ba41ce0fe0f7 Mon Sep 17 00:00:00 2001 From: Katarina Behrens Date: Wed, 20 Sep 2017 13:12:27 +0200 Subject: Different take on tdf#108406: exclude helpimg from installed themes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit as it still might get selected as default theme under some circumstances and removing it from list in optgdlg.cxx leads to crash This reverts commit 60adba3fb904ed66251ff39c82fe20bec151ef0b but allegedly still crashes on Debian Change-Id: Ib853cc27058d8635482f19a8db26075d64103e1b Reviewed-on: https://gerrit.libreoffice.org/42545 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- cui/source/options/optgdlg.cxx | 4 ---- 1 file changed, 4 deletions(-) (limited to 'cui') diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index b27de607befe..95dcafddabc9 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -633,10 +633,6 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet) StyleSettings aStyleSettings = Application::GetSettings().GetStyleSettings(); mInstalledIconThemes = aStyleSettings.GetInstalledIconThemes(); - //Removing "Helpimg" from the list, as it is not a real iconset (see tdf#108406) - mInstalledIconThemes.erase(std::remove_if(mInstalledIconThemes.begin(), mInstalledIconThemes.end(), - [](vcl::IconThemeInfo theme) { return theme.GetDisplayName() == "Helpimg";}), mInstalledIconThemes.end()); - // Start with the automatically chosen icon theme OUString autoThemeId = aStyleSettings.GetAutomaticallyChosenIconTheme(); const vcl::IconThemeInfo& autoIconTheme = vcl::IconThemeInfo::FindIconThemeById(mInstalledIconThemes, autoThemeId); -- cgit