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 /unoidl | |
| parent | 7e7dd7f152bc7457437f541e7ff88d69e9f8e765 (diff) | |
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 'unoidl')
| -rw-r--r-- | unoidl/source/unoidl-check.cxx | 4 | ||||
| -rw-r--r-- | unoidl/source/unoidl-read.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/unoidl/source/unoidl-check.cxx b/unoidl/source/unoidl-check.cxx index a3cade0b0334..58b179ea41b0 100644 --- a/unoidl/source/unoidl-check.cxx +++ b/unoidl/source/unoidl-check.cxx @@ -174,7 +174,7 @@ void checkMap( OUString name(prefix + id); if (entA->getSort() == unoidl::Entity::SORT_MODULE) { checkMap( - providerB, OUString(name + "."), + providerB, OUStringConcatenation(name + "."), (static_cast<unoidl::ModuleEntity *>(entA.get()) ->createCursor()), ignoreUnpublished); @@ -920,7 +920,7 @@ void checkIds( switch (entB->getSort()) { case unoidl::Entity::SORT_MODULE: checkIds( - providerA, OUString(name + "."), + providerA, OUStringConcatenation(name + "."), (static_cast<unoidl::ModuleEntity *>(entB.get()) ->createCursor())); break; diff --git a/unoidl/source/unoidl-read.cxx b/unoidl/source/unoidl-read.cxx index 443cade3ea07..e7e82d7a0b86 100644 --- a/unoidl/source/unoidl-read.cxx +++ b/unoidl/source/unoidl-read.cxx @@ -229,7 +229,7 @@ void scanMap( scanMap( manager, static_cast<unoidl::ModuleEntity *>(ent.get())->createCursor(), - published, OUString(name + "."), entities); + published, OUStringConcatenation(name + "."), entities); } else { std::map<OUString, Entity>::iterator i( entities.insert( |