[libreoffice] 01/01: backport helpimg icon fix from libreoffice-5-4

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit 160140f29bc7958f5130ea4ab88db868d69b90cc
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Sep 11 19:21:09 2017 +0200

    backport helpimg icon fix from libreoffice-5-4
---
 changelog                                          |  3 ++
 .../make-helpimg-not-selectable-as-iconset.diff    | 32 ++++++++++++++++++++++
 patches/series                                     |  1 +
 3 files changed, 36 insertions(+)

diff --git a/changelog b/changelog
index f402919..8b06c55 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,8 @@
 libreoffice (1:5.4.1-2) UNRELEASED; urgency=medium
 
+  * debian/patches/make-helpimg-not-selectable-as-iconset.diff: as name
+    says, from libreoffice-5-4 branch (closes: #874196)
+
   * debian/rules:
     - move STRETCH_BACKPORT conditional for coinmp lower in rules so it
       gets honoured and make libwps/libmwaw internal unconditionally
diff --git a/patches/make-helpimg-not-selectable-as-iconset.diff b/patches/make-helpimg-not-selectable-as-iconset.diff
new file mode 100644
index 0000000..d8ff2d5
--- /dev/null
+++ b/patches/make-helpimg-not-selectable-as-iconset.diff
@@ -0,0 +1,32 @@
+From 73e91d3652bbe4cf942464f9a6c582b574d578d1 Mon Sep 17 00:00:00 2001
+From: Andreas Brandner <Andreas.Brandner at cib.de>
+Date: Fri, 8 Sep 2017 18:51:21 +0200
+Subject: 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>
+(cherry picked from commit 60adba3fb904ed66251ff39c82fe20bec151ef0b)
+Reviewed-on: https://gerrit.libreoffice.org/42140
+Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
+
+diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
+index 07496d9..40cbe21 100644
+--- a/cui/source/options/optgdlg.cxx
++++ b/cui/source/options/optgdlg.cxx
+@@ -665,6 +665,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);
+-- 
+cgit v0.10.2
+
diff --git a/patches/series b/patches/series
index 98d02d2..8ad0e5b 100644
--- a/patches/series
+++ b/patches/series
@@ -32,3 +32,4 @@ disable-unused-test-programs.diff
 gb_SUPPRESS_TESTS.diff
 stop-shipping-mimelnk-desktop-files.diff
 java9.diff
+make-helpimg-not-selectable-as-iconset.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git