diff options
| author | sb <sb@openoffice.org> | 2010-09-23 16:17:38 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-09-23 16:17:38 +0200 |
| commit | c95c83950c9de73ca9a01f7b468b72b77c19c051 (patch) | |
| tree | c1be9366d4949cd2701376f09a074f47e820c9e1 /configmgr/source/childaccess.cxx | |
| parent | f1be314fad35a4c0c64d57fd8c6d9c5b6c9479c8 (diff) | |
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 ef2b213d4ef1..c20fa49fb18c 100644 --- a/configmgr/source/childaccess.cxx +++ b/configmgr/source/childaccess.cxx @@ -283,8 +283,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); @@ -301,10 +302,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(); + } } } } |