diff options
| author | Andreas Brandner <Andreas.Brandner@cib.de> | 2017-09-08 18:51:21 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-09-09 23:32:18 +0200 |
| commit | 60adba3fb904ed66251ff39c82fe20bec151ef0b (patch) | |
| tree | 165c14044a02cc45bacd74db039b19dafb820fc7 | |
| parent | 25e395c7e07015fb5c9b88978093889315d32f3c (diff) | |
tdf#108406 offline help-images helpimg are no longer selectable as iconset
Change-Id: I6733ed2a04c01c288de2cd6af938a6c6ff1b4481
Reviewed-on: https://gerrit.libreoffice.org/42117
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index cded70d2be90..d68454e6f8d8 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -660,6 +660,10 @@ 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); |