[libreoffice] 02/152: lp#1508177: create profile defaulting to human style on unity

[Rene Engelhard]

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

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit fb45281f01fd9b5476c9c30db9798aa14e3558bc
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Oct 20 23:23:06 2015 +0200

    lp#1508177: create profile defaulting to human style on unity
---
 changelog                        |  4 ++--
 patches/series                   |  1 +
 patches/unity-default-human.diff | 24 ++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index c22b519..a353d92 100644
--- a/changelog
+++ b/changelog
@@ -7,9 +7,9 @@ libreoffice (1:5.0.2-0ubuntu2~wily1~ppa1) wily; urgency=medium
       openoffice*-debian-menus contains /usr/bin/soffice
   * fix gug language description (thanks Rene)
   * add build version for "About LibreOffice"
+  * create profile defaulting to human style on unity (lp: #1508177)
 
- -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Mon, 12 Oct 2015 09:57:53 +0100
-
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Tue, 20 Oct 2015 23:21:02 +0200
 
 libreoffice (1:5.0.2-0ubuntu1) wily; urgency=medium
 
diff --git a/patches/series b/patches/series
index 6a889d5..9d75c75 100644
--- a/patches/series
+++ b/patches/series
@@ -30,3 +30,4 @@ liborcus-0.9.1.diff
 disable-tiledrendering-test.diff
 #lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
 #mailmerge-base.diff
+unity-default-human.diff
diff --git a/patches/unity-default-human.diff b/patches/unity-default-human.diff
new file mode 100644
index 0000000..d657c76
--- /dev/null
+++ b/patches/unity-default-human.diff
@@ -0,0 +1,24 @@
+From: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
+Date: Tue, 20 Oct 2015 23:10:36 +0200
+Subject: [PATCH] on unity, default to human if possible
+
+---
+ vcl/source/app/IconThemeSelector.cxx | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx
+--- a/vcl/source/app/IconThemeSelector.cxx
++++ b/vcl/source/app/IconThemeSelector.cxx
+@@ -65,6 +65,9 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi
+     else if ( desktopEnvironment.equalsIgnoreAsciiCase("MacOSX") ) {
+         r = "breeze";
+     }
++    else if ( desktopEnvironment.equalsIgnoreAsciiCase("unity") ) {
++        r = "human";
++    }
+     else {
+         r = FALLBACK_ICON_THEME_ID;
+     }
+-- 
+2.1.4
+

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