configmgr/source/dconf.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit 62924b92d6737579cc4709b410d311251d4e5517 Author: Caolán McNamara <[email protected]> AuthorDate: Tue Nov 23 16:46:07 2021 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Nov 23 20:42:35 2021 +0100 fix configmgr --enable-dconf build error: no viable conversion from 'const char [1]' to 'std::u16string_view' (aka 'basic_string_view<char16_t>') and warning: instead of an 'rtl::OUString' constructed from a 'char16_t', pass a 'std::u16string_view' (or an 'rtl::OUStringChar') [loplugin:stringview] Change-Id: I0e611606190f063227c5467dc5a082277cebaaa0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125706 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/configmgr/source/dconf.cxx b/configmgr/source/dconf.cxx index 1c0711ff1927..9db51fa17cfb 100644 --- a/configmgr/source/dconf.cxx +++ b/configmgr/source/dconf.cxx @@ -231,11 +231,11 @@ bool decode(OUString * string, bool slash) { return true; } if (string->match("00", i + 1)) { - *string = string->replaceAt(i, 3, OUString(u'\0')); + *string = string->replaceAt(i, 3, OUStringChar(u'\0')); } else if (slash && string->match("2F", i + 1)) { - *string = string->replaceAt(i, 3, "/"); + *string = string->replaceAt(i, 3, u"/"); } else if (string->match("5C", i + 1)) { - *string = string->replaceAt(i + 1, 2, ""); + *string = string->replaceAt(i + 1, 2, u""); } else { SAL_WARN("configmgr.dconf", "bad escape in " << *string); return false;
