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

[Stephan Bergmann]

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

New commits:
commit 8da1d7869a2bdbe006265f584e0d9af5046ef723
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Aug 22 17:55:23 2016 +0200

    Remove WorkPathVariable support from KDE backends
    
    ...now that b5c05876f73c31270bc374e4f481ef1d09a42e5f "Related: rhbz#1065807
    recover using xdg templates and documents settings" handles WorkPathVariable in
    the generic shell/source/backends/desktopbe/desktopbackend.cxx code.
    
    Change-Id: I3920cdb3f54688462813d212569c9b33a1371333

diff --git a/shell/source/backends/kde4be/kde4access.cxx b/shell/source/backends/kde4be/kde4access.cxx
index 5d962b7..914daba 100644
--- a/shell/source/backends/kde4be/kde4access.cxx
+++ b/shell/source/backends/kde4be/kde4access.cxx
@@ -86,17 +86,6 @@ css::beans::Optional< css::uno::Any > getValue(OUString const & id) {
         bool ATToolSupport = false;
         return css::beans::Optional< css::uno::Any >(
             true, uno::makeAny( OUString::boolean( ATToolSupport ) ) );
-    } else if (id == "WorkPathVariable")
-    {
-        QString aDocumentsDir( KGlobalSettings::documentPath() );
-        OUString sDocumentsDir;
-        OUString sDocumentsURL;
-        if ( aDocumentsDir.endsWith(QChar('/')) )
-            aDocumentsDir.truncate ( aDocumentsDir.length() - 1 );
-        sDocumentsDir = reinterpret_cast<const sal_Unicode *>(aDocumentsDir.utf16());
-        osl_getFileURLFromSystemPath( sDocumentsDir.pData, &sDocumentsURL.pData );
-        return css::beans::Optional< css::uno::Any >(
-            true, uno::makeAny( sDocumentsURL ) );
     } else if (id == "ooInetFTPProxyName")
     {
         QString aFTPProxy;
diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx
index 90473d3..fd049a2 100644
--- a/shell/source/backends/kde4be/kde4backend.cxx
+++ b/shell/source/backends/kde4be/kde4backend.cxx
@@ -167,7 +167,7 @@ css::uno::Any Service::getPropertyValue(OUString const & PropertyName)
         css::uno::RuntimeException, std::exception)
 {
     if (PropertyName == "EnableATToolSupport" || PropertyName == "ExternalMailer" || PropertyName == "SourceViewFontHeight"
-     || PropertyName == "SourceViewFontName" || PropertyName == "WorkPathVariable" || PropertyName == "ooInetFTPProxyName"
+     || PropertyName == "SourceViewFontName" || PropertyName == "ooInetFTPProxyName"
      || PropertyName == "ooInetFTPProxyPort" || PropertyName == "ooInetHTTPProxyName" || PropertyName == "ooInetHTTPProxyPort"
      || PropertyName == "ooInetHTTPSProxyName" || PropertyName == "ooInetHTTPSProxyPort" || PropertyName == "ooInetNoProxy"
      || PropertyName == "ooInetProxyType" )
diff --git a/shell/source/backends/kdebe/kdeaccess.cxx b/shell/source/backends/kdebe/kdeaccess.cxx
index a0a5156..116ae97 100644
--- a/shell/source/backends/kdebe/kdeaccess.cxx
+++ b/shell/source/backends/kdebe/kdeaccess.cxx
@@ -82,17 +82,6 @@ css::beans::Optional< css::uno::Any > getValue(OUString const & id) {
         bool ATToolSupport = false;
         return css::beans::Optional< css::uno::Any >(
             true, uno::makeAny( OUString::boolean( ATToolSupport ) ) );
-    } else if (id == "WorkPathVariable")
-    {
-        QString aDocumentsDir( KGlobalSettings::documentPath() );
-        OUString sDocumentsDir;
-        OUString sDocumentsURL;
-        if ( aDocumentsDir.endsWith(QChar('/')) )
-            aDocumentsDir.truncate ( aDocumentsDir.length() - 1 );
-        sDocumentsDir = reinterpret_cast<const sal_Unicode *>(aDocumentsDir.ucs2());
-        osl_getFileURLFromSystemPath( sDocumentsDir.pData, &sDocumentsURL.pData );
-        return css::beans::Optional< css::uno::Any >(
-            true, uno::makeAny( sDocumentsURL ) );
     } else if (id == "ooInetFTPProxyName")
     {
         QString aFTPProxy;
diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx
index 192ee75..aca29de 100644
--- a/shell/source/backends/kdebe/kdebackend.cxx
+++ b/shell/source/backends/kdebe/kdebackend.cxx
@@ -169,7 +169,7 @@ css::uno::Any Service::getPropertyValue(OUString const & PropertyName)
         css::uno::RuntimeException, std::exception)
 {
     if ( PropertyName == "EnableATToolSupport" || PropertyName == "ExternalMailer" || PropertyName == "SourceViewFontHeight"
-      || PropertyName == "SourceViewFontName" || PropertyName == "WorkPathVariable" || PropertyName == "ooInetFTPProxyName"
+      || PropertyName == "SourceViewFontName" || PropertyName == "ooInetFTPProxyName"
       || PropertyName == "ooInetFTPProxyPort" || PropertyName == "ooInetHTTPProxyName" || PropertyName == "ooInetHTTPProxyPort"
       || PropertyName == "ooInetHTTPSProxyName" || PropertyName == "ooInetHTTPSProxyPort" || PropertyName == "ooInetNoProxy"
       || PropertyName == "ooInetProxyType" )