[Libreoffice-commits] core.git: shell/source

[Stephan Bergmann]

 shell/source/backends/kde4be/kde4backend.cxx |    2 +-
 shell/source/backends/kdebe/kdebackend.cxx   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 72812a380c0d9587670bae1d1efa8700c874634e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Aug 22 17:52:24 2016 +0200

    Revert "KDE: don't throw on TemplatePathVariable"
    
    This reverts commit e44a7eefb7f632977b4c8c91ad14244372c6e04d, which is no longer
    necessary now that b5c05876f73c31270bc374e4f481ef1d09a42e5f "Related:
    rhbz#1065807 recover using xdg templates and documents settings" handles
    TemplatePathVariable in the generic
    shell/source/backends/desktopbe/desktopbackend.cxx code.

diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx
index 013e532..90473d3 100644
--- a/shell/source/backends/kde4be/kde4backend.cxx
+++ b/shell/source/backends/kde4be/kde4backend.cxx
@@ -170,7 +170,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 == "TemplatePathVariable" )
+     || PropertyName == "ooInetProxyType" )
     {
         return css::uno::makeAny(
             enabled_
diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx
index 7381131..192ee75 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 == "TemplatePathVariable" )
+      || PropertyName == "ooInetProxyType" )
     {
         return css::uno::makeAny(
             enabled_