diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-11-23 16:46:07 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-11-23 20:42:35 +0100 |
| commit | 62924b92d6737579cc4709b410d311251d4e5517 (patch) | |
| tree | bcd6cf01dbfe0a7187291cce32af4d0e86466464 /configmgr | |
| parent | bdef11f5337ecc87556a92693f6b7b5e200eb29e (diff) | |
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 <caolanm@redhat.com>
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/dconf.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
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; |