[libreoffice] 01/01: Revert "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 72d1c703f617b09888a31270c3a0a09e90f8af5b
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Sep 18 10:49:21 2017 +0200

    Revert "backport helpimg icon fix from libreoffice-5-4"
    
    Crashes / throws "wrapped std::exception "Could not find theme id in theme
    vector" in Tools->Options->View
    
    This reverts commit 160140f29bc7958f5130ea4ab88db868d69b90cc.
---
 changelog                                          |  4 +--
 .../make-helpimg-not-selectable-as-iconset.diff    | 32 ----------------------
 patches/series                                     |  1 -
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/changelog b/changelog
index 04b7e3f..a11893d 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,5 @@
-libreoffice (1:5.4.1-2) unstable; urgency=medium
+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/patches/icu-no-icu-config.diff: don't use icu-config for
     determining the ICU version; doesn't exist in (Debians) ICU 59.1 anymore
 
diff --git a/patches/make-helpimg-not-selectable-as-iconset.diff b/patches/make-helpimg-not-selectable-as-iconset.diff
deleted file mode 100644
index d8ff2d5..0000000
--- a/patches/make-helpimg-not-selectable-as-iconset.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-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 0b66a1e..7328c07 100644
--- a/patches/series
+++ b/patches/series
@@ -32,5 +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
 icu-no-icu-config.diff

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