diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-09-30 13:54:26 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2021-10-03 19:50:44 +0200 |
| commit | ad1557f5d775739230e0e2252c293948977b42a0 (patch) | |
| tree | 610e2e849d87583888c0c658088044d6dc3966a5 /cui/source | |
| parent | drop 'using namespace std' in desktop, e*, f* (diff) | |
| download | core-ad1557f5d775739230e0e2252c293948977b42a0.tar.gz core-ad1557f5d775739230e0e2252c293948977b42a0.zip | |
A more lightweight O[U]StringConcatenation
...compared to a full-blown O[U]String, for temporary objects holding an
O[U]StringConcat result that can then be used as a std::[u16]string_view.
It's instructive to see how some invocations of operator ==, operator !=, and
O[U]StringBuffer::insert with an O[U]StringConcat argument required implicit
materialization of an O[U]String temporary, and how that expensive operation has
now been made explicit with the explicit O[U]StringConcatenation ctor.
(The additional operator == and operator != overloads are necessary because the
overloads taking two std::[u16]string_view parameters wouldn't even be found
here with ADL. And the OUString-related ones would cause ambiguities in at
least sal/qa/rtl/strings/test_oustring_stringliterals.cxx built with
RTL_STRING_UNITTEST, so have simply been disabled for that special test-code
case.)
Change-Id: Id29799fa8da21a09ff9794cbc7cc9b366e6803b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122890
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'cui/source')
| -rw-r--r-- | cui/source/dialogs/scriptdlg.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index f4d347b0ef84..4b4092f9c760 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -756,7 +756,7 @@ void SvxScriptOrgDialog::createEntry(const weld::TreeIter& rEntry) } for( const Reference< browse::XBrowseNode >& n : std::as_const(childNodes) ) { - if (aNewName+extn == n->getName()) + if (OUStringConcatenation(aNewName+extn) == n->getName()) { bFound = true; break; @@ -783,7 +783,7 @@ void SvxScriptOrgDialog::createEntry(const weld::TreeIter& rEntry) bValid = true; for( const Reference< browse::XBrowseNode >& n : std::as_const(childNodes) ) { - if (aUserSuppliedName+extn == n->getName()) + if (OUStringConcatenation(aUserSuppliedName+extn) == n->getName()) { bValid = false; OUString aError = m_createErrStr + m_createDupStr; |