[Libreoffice-commits] core.git: cui/source
Andreas Brandner
Andreas.Brandner at cib.de
Sat Sep 9 21:32:39 UTC 2017
cui/source/options/optgdlg.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 60adba3fb904ed66251ff39c82fe20bec151ef0b
Author: Andreas Brandner <Andreas.Brandner at cib.de>
Date: Fri Sep 8 18:51:21 2017 +0200
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 at libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
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);
More information about the Libreoffice-commits
mailing list