xmloff/source/core/xmlimp.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
New commits: commit cfb1df718c337a9e130d8e4c26351589e45452af Author: Tor Lillqvist <[email protected]> AuthorDate: Fri Nov 7 15:53:16 2025 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sun Nov 9 10:11:19 2025 +0100 Don't let the last translation act as a default Change-Id: Ia75743ad23ce651c9aab392098686d1978b49fe2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193629 Reviewed-by: Tor Lillqvist <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index d0b0f6e855a8..fd0d1cc8baf1 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -524,7 +524,9 @@ namespace { break; } } - if (aKeyString.isEmpty()) + if (aLocale.isEmpty()) + ; // Do nothing, we don't have a matching translation + else if (aKeyString.isEmpty()) aKeyString = aStr; else { commit babf3400599909d17d777976b8715e2014fdabff Author: Rashesh Padia <[email protected]> AuthorDate: Thu Nov 6 13:26:53 2025 +0530 Commit: Andras Timar <[email protected]> CommitDate: Sun Nov 9 10:11:10 2025 +0100 l10nMapper: update cleanDomain to use "_" prefix Change-Id: I2c7a1393281768f89978f0090ac6e2e0b8866ad1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193628 Reviewed-by: Andras Timar <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 70275f072fdf..d0b0f6e855a8 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -568,8 +568,8 @@ namespace { static OUString cleanDomain(const OUString &str) { - sal_Int32 idx = str.indexOf('|'); - if (idx > 0) + sal_Int32 idx = str.indexOf('_'); + if (idx > -1) return str.copy(idx+1); else return str;
