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

[Stephan Bergmann]

 configmgr/source/childaccess.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 12c2bbc317b355353d4f725c9439fbde803b4fc4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Sep 23 18:34:50 2015 +0200

    Report nil-valued localized property as such
    
    ...regression introduced with 879aa54e895a56cb65f93ae98e6a9e7b08981a47
    "configmgr: accelerate simple config key fetches."
    
    Change-Id: Ifb732a25d902f58c76e06ebaad3a6178ff102f58

diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx
index a9771ff..7295f89 100644
--- a/configmgr/source/childaccess.cxx
+++ b/configmgr/source/childaccess.cxx
@@ -269,8 +269,7 @@ css::uno::Any ChildAccess::asValue()
                 rtl::Reference< ChildAccess > child(getChild("*" + locale));
                 // As a last resort, return a nil value even though it may be
                 // illegal for the given property:
-                if (child.is())
-                    return child->asValue();
+                return child.is() ? child->asValue() : css::uno::Any();
             }
         }
         value = css::uno::makeAny(