diff options
| author | sb <sb@openoffice.org> | 2010-09-23 16:17:38 +0200 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2010-11-21 14:48:51 +0100 |
| commit | 830738b795cbb5c7998d13b665dd905efb0205e0 (patch) | |
| tree | bb9f97e3da4cc385b4479e18447647ab873fb76a /configmgr/source/childaccess.cxx | |
| parent | Fix crash during toolpanel re-docking (diff) | |
| download | core-830738b795cbb5c7998d13b665dd905efb0205e0.tar.gz core-830738b795cbb5c7998d13b665dd905efb0205e0.zip | |
sb132: #i114155# use "en" as additional fallback locale after "en-US"
(transplanted from 630d6876c61cd1e0d42b8aa18bfc2ab22079a20f)
Diffstat (limited to 'configmgr/source/childaccess.cxx')
| -rw-r--r-- | configmgr/source/childaccess.cxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx index 81e0febe1123..d3b54800e41a 100644 --- a/configmgr/source/childaccess.cxx +++ b/configmgr/source/childaccess.cxx @@ -284,8 +284,9 @@ css::uno::Any ChildAccess::asValue() { // Find best match using an adaption of RFC 4647 lookup matching // rules, removing "-" or "_" delimited segments from the end; // defaults are the empty string locale, the "en-US" locale, the - // first child (if any), or a nil value (even though it may be - // illegal for the given property), in that order: + // "en" locale, the first child (if any), or a nil value (even + // though it may be illegal for the given property), in that + // order: rtl::Reference< ChildAccess > child; for (;;) { child = getChild(locale); @@ -302,10 +303,14 @@ css::uno::Any ChildAccess::asValue() { child = getChild( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en-US"))); if (!child.is()) { - std::vector< rtl::Reference< ChildAccess > > all( - getAllChildren()); - if (!all.empty()) { - child = all.front(); + child = getChild( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"))); + if (!child.is()) { + std::vector< rtl::Reference< ChildAccess > > all( + getAllChildren()); + if (!all.empty()) { + child = all.front(); + } } } } |