[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - shell/source

[Stephan Bergmann]

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

New commits:
commit f58edf27dab32b693def8c16cf56734f27c87ad2
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Apr 17 17:06:02 2015 +0200

    Don't throw UnknownPropertyException for givenname/sn from KDE backends
    
    Open TODO to actually obtain values for them, instead of returning an empty
    css::beans::Optional representing "no value available."
    
    Change-Id: Iceb286e9873216f7bc36bd88b09ac03bd3a2c895

diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx
index 4670aff..05931bd 100644
--- a/shell/source/backends/kde4be/kde4backend.cxx
+++ b/shell/source/backends/kde4be/kde4backend.cxx
@@ -178,6 +178,9 @@ css::uno::Any Service::getPropertyValue(OUString const & PropertyName)
             enabled_
             ? kde4access::getValue(PropertyName)
             : css::beans::Optional< css::uno::Any >());
+    } else if (PropertyName == "givenname" || PropertyName == "sn") {
+        return css::uno::makeAny(css::beans::Optional< css::uno::Any >());
+            //TODO: obtain values from KDE?
     }
     throw css::beans::UnknownPropertyException(
         PropertyName, static_cast< cppu::OWeakObject * >(this));
diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx
index 96b5a44..77a561d 100644
--- a/shell/source/backends/kdebe/kdebackend.cxx
+++ b/shell/source/backends/kdebe/kdebackend.cxx
@@ -178,6 +178,9 @@ css::uno::Any Service::getPropertyValue(OUString const & PropertyName)
             enabled_
             ? kdeaccess::getValue(PropertyName)
             : css::beans::Optional< css::uno::Any >());
+    } else if (PropertyName == "givenname" || PropertyName == "sn") {
+        return css::uno::makeAny(css::beans::Optional< css::uno::Any >());
+            //TODO: obtain values from KDE?
     }
     throw css::beans::UnknownPropertyException(
         PropertyName, static_cast< cppu::OWeakObject * >(this));