diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2017-09-20 13:12:27 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-09-25 13:11:13 +0200 |
| commit | 7e7b9652f44f01fbaf5bc3fde454ba41ce0fe0f7 (patch) | |
| tree | cc897d236448ed04235f3b55c14926127047564e | |
| parent | 84ccf8051f5d39414621417292f4054cfb4454e1 (diff) | |
Different take on tdf#108406: exclude helpimg from installed themes
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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/app/IconThemeInfo.cxx | 6 |
2 files changed, 6 insertions, 4 deletions
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); diff --git a/vcl/source/app/IconThemeInfo.cxx b/vcl/source/app/IconThemeInfo.cxx index b3f6d9a40a33..0a6b4f159b03 100644 --- a/vcl/source/app/IconThemeInfo.cxx +++ b/vcl/source/app/IconThemeInfo.cxx @@ -28,6 +28,8 @@ static const OUStringLiteral BREEZE_DARK_DISPLAY_NAME("Breeze Dark"); static const OUStringLiteral SIFR_DARK_ID("sifr_dark"); static const OUStringLiteral SIFR_DARK_DISPLAY_NAME("Sifr Dark"); +static const OUStringLiteral HELPIMG_FAKE_THEME("helpimg"); + OUString filename_from_url(const OUString& url) { @@ -94,6 +96,10 @@ IconThemeInfo::UrlCanBeParsed(const OUString& url) return false; } + if (fname.indexOf(HELPIMG_FAKE_THEME) != -1 ) { + return false; + } + return true; } |