summaryrefslogtreecommitdiff
path: root/svtools/source/svhtml
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2021-09-30 13:54:26 +0200
committerStephan Bergmann <sbergman@redhat.com>2021-10-03 19:50:44 +0200
commitad1557f5d775739230e0e2252c293948977b42a0 (patch)
tree610e2e849d87583888c0c658088044d6dc3966a5 /svtools/source/svhtml
parent7e7dd7f152bc7457437f541e7ff88d69e9f8e765 (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 'svtools/source/svhtml')
-rw-r--r--svtools/source/svhtml/HtmlWriter.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/svtools/source/svhtml/HtmlWriter.cxx b/svtools/source/svhtml/HtmlWriter.cxx
index 8cd7dc8705b4..f7c35a644706 100644
--- a/svtools/source/svhtml/HtmlWriter.cxx
+++ b/svtools/source/svhtml/HtmlWriter.cxx
@@ -52,7 +52,7 @@ void HtmlWriter::start(const OString& aElement)
}
mrStream.WriteChar('<');
- mrStream.WriteOString(OString(maNamespace + aElement));
+ mrStream.WriteOString(OStringConcatenation(maNamespace + aElement));
mbElementOpen = true;
}
@@ -107,7 +107,7 @@ void HtmlWriter::end()
}
}
mrStream.WriteCharPtr("</");
- mrStream.WriteOString(OString(maNamespace + maElementStack.back()));
+ mrStream.WriteOString(OStringConcatenation(maNamespace + maElementStack.back()));
mrStream.WriteCharPtr(">");
if (mbPrettyPrint)
mrStream.WriteCharPtr("\n");