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 /sfx2/source | |
| 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 'sfx2/source')
| -rw-r--r-- | sfx2/source/appl/newhelp.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/classificationhelper.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 3749b3cf8a12..1325dff8ce71 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -2322,7 +2322,7 @@ IMPL_LINK_NOARG(SfxHelpWindow_Impl, OpenHdl, LinkParamNone*, void) else aId = aEntry; - sHelpURL = SfxHelpWindow_Impl::buildHelpURL(xIndexWin->GetFactory(), OUString("/" + aId), aAnchor); + sHelpURL = SfxHelpWindow_Impl::buildHelpURL(xIndexWin->GetFactory(), OUStringConcatenation("/" + aId), aAnchor); } loadHelpContent(sHelpURL); diff --git a/sfx2/source/view/classificationhelper.cxx b/sfx2/source/view/classificationhelper.cxx index 629ceeaef560..457872bf9da2 100644 --- a/sfx2/source/view/classificationhelper.cxx +++ b/sfx2/source/view/classificationhelper.cxx @@ -581,7 +581,7 @@ SfxClassificationHelper::SfxClassificationHelper(const uno::Reference<document:: continue; //TODO: Support abbreviated names(?) - if (rProperty.Name == (aPrefix + PROP_BACNAME())) + if (rProperty.Name == OUStringConcatenation(aPrefix + PROP_BACNAME())) m_pImpl->m_aCategory[eType].m_aName = aValue; else m_pImpl->m_aCategory[eType].m_aLabels[rProperty.Name] = aValue; |