[libreoffice] Related: rhbz#1065807 don't throw with no 'Templates' dir under KDE

[Caolán McNamara]

commit 2d70aeb3fa026f0c410adba59b445d545f06dbe7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 28 08:57:46 2014 +0000

    Related: rhbz#1065807 don't throw with no 'Templates' dir under KDE

 0001-KDE-don-t-throw-on-TemplatePathVariable.patch |   51 ++++++++++++++++++++
 libreoffice.spec                                   |    6 ++-
 2 files changed, 56 insertions(+), 1 deletions(-)
---
diff --git a/0001-KDE-don-t-throw-on-TemplatePathVariable.patch b/0001-KDE-don-t-throw-on-TemplatePathVariable.patch
new file mode 100644
index 0000000..4959bd7
--- /dev/null
+++ b/0001-KDE-don-t-throw-on-TemplatePathVariable.patch
@@ -0,0 +1,51 @@
+From e44a7eefb7f632977b4c8c91ad14244372c6e04d Mon Sep 17 00:00:00 2001
+From: Maxim Monastirsky <momonasmon at gmail.com>
+Date: Wed, 26 Feb 2014 17:02:38 +0200
+Subject: [PATCH] KDE: don't throw on TemplatePathVariable
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is required after commit
+838b77f5f3d6d8fd98891e99a23ff78a6a357cb2.
+
+Actual functionality is still missing.
+
+Change-Id: Ib94d8a982609de730d9c61bf7bf9886093c51f5b
+Reviewed-on: https://gerrit.libreoffice.org/8367
+Reviewed-by: Caolán McNamara <caolanm at redhat.com>
+Tested-by: Caolán McNamara <caolanm at redhat.com>
+---
+ shell/source/backends/kde4be/kde4backend.cxx | 2 +-
+ shell/source/backends/kdebe/kdebackend.cxx   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx
+index bf12683..1d486e4 100644
+--- a/shell/source/backends/kde4be/kde4backend.cxx
++++ b/shell/source/backends/kde4be/kde4backend.cxx
+@@ -172,7 +172,7 @@ css::uno::Any Service::getPropertyValue(OUString const & PropertyName)
+      || PropertyName == "SourceViewFontName" || PropertyName == "WorkPathVariable" || PropertyName == "ooInetFTPProxyName"
+      || PropertyName == "ooInetFTPProxyPort" || PropertyName == "ooInetHTTPProxyName" || PropertyName == "ooInetHTTPProxyPort"
+      || PropertyName == "ooInetHTTPSProxyName" || PropertyName == "ooInetHTTPSProxyPort" || PropertyName == "ooInetNoProxy"
+-     || PropertyName == "ooInetProxyType" )
++     || PropertyName == "ooInetProxyType" || PropertyName == "TemplatePathVariable" )
+     {
+         return css::uno::makeAny(
+             enabled_
+diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx
+index 8089632..08915e8 100644
+--- a/shell/source/backends/kdebe/kdebackend.cxx
++++ b/shell/source/backends/kdebe/kdebackend.cxx
+@@ -172,7 +172,7 @@ css::uno::Any Service::getPropertyValue(OUString const & PropertyName)
+       || PropertyName == "SourceViewFontName" || PropertyName == "WorkPathVariable" || PropertyName == "ooInetFTPProxyName"
+       || PropertyName == "ooInetFTPProxyPort" || PropertyName == "ooInetHTTPProxyName" || PropertyName == "ooInetHTTPProxyPort"
+       || PropertyName == "ooInetHTTPSProxyName" || PropertyName == "ooInetHTTPSProxyPort" || PropertyName == "ooInetNoProxy"
+-      || PropertyName == "ooInetProxyType" )
++      || PropertyName == "ooInetProxyType" || PropertyName == "TemplatePathVariable" )
+     {
+         return css::uno::makeAny(
+             enabled_
+-- 
+1.8.5.3
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 9c47edd..13c8b88 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -43,7 +43,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.1
-Release:        1%{?libo_prerelease}%{?dist}
+Release:        2%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0
 Group:          Applications/Productivity
 URL:            http://www.libreoffice.org/default/
@@ -281,6 +281,7 @@ Patch18: 0001-Resolves-rhbz-1065807-use-xdg-Templates-for-default-.patch
 Patch19: 0001-explictly-list-common-lang-independant-template-dir.patch
 Patch20: 0001-rhbz-1057977-avoid-use-of-invalidated-pointers.patch
 Patch21: 0001-fdo-75540-setProcessServiceFactory-must-be-called-be.patch
+Patch22: 0001-KDE-don-t-throw-on-TemplatePathVariable.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -2176,6 +2177,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Fri Feb 28 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.2.2.1-2
+- Related: rhbz#1065807 don't throw with no "Templates" dir under KDE
+
 * Thu Feb 27 2014 David Tardon <dtardon at redhat.com> - 1:4.2.2.1-1
 - update to 4.2.2 rc1