summaryrefslogtreecommitdiff
path: root/configmgr
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-09-23 18:34:50 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-09-23 18:36:37 +0200
commit12c2bbc317b355353d4f725c9439fbde803b4fc4 (patch)
treeb99a7d91b44848f31f332137368f8937522d5913 /configmgr
parent09b637e36528165f5e937a418640d95440dac9ef (diff)
Report nil-valued localized property as such
...regression introduced with 879aa54e895a56cb65f93ae98e6a9e7b08981a47 "configmgr: accelerate simple config key fetches." Change-Id: Ifb732a25d902f58c76e06ebaad3a6178ff102f58
Diffstat (limited to 'configmgr')
-rw-r--r--configmgr/source/childaccess.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx
index a9771ff78d20..7295f8908b1b 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(