path: root/writerfilter/source/rtftok/rtfdocumentimpl.cxx
diff options
authorStephan Bergmann <>2020-08-27 11:40:59 +0200
committerStephan Bergmann <>2020-08-28 08:07:09 +0200
commit33ecd0d5c4fff9511a8436513936a3f7044a775a (patch)
treec25809adda140ff89d9f2a2b6dfadba17e188fb0 /writerfilter/source/rtftok/rtfdocumentimpl.cxx
parent554834484a3323f73b5aeace246bcd9635368967 (diff)
Change OUStringLiteral from char[] to char16_t[]
This is a prerequisite for making conversion from OUStringLiteral to OUString more efficient at least for C++20 (by replacing its internals with a constexpr- generated sal_uString-compatible layout with a SAL_STRING_STATIC_FLAG refCount, conditionally for C++20 for now). For a configure-wise bare-bones build on Linux, size reported by `du -bs instdir` grew by 118792 bytes from 1155636636 to 1155755428. In most places just a u"..." string literal prefix had to be added. In some places char const a[] = "..."; variables have been changed to char16_t, and a few places required even further changes to code (which prompted the addition of include/o3tl/string_view.hxx helper function o3tl::equalsIgnoreAsciiCase and the additional OUString::createFromAscii overload). For all uses of macros expanding to string literals, the relevant uses have been rewritten as u"" MACRO instead of changing the macro definitions. It should be possible to change at least some of those macro definitions (and drop the u"" from their call sites) in follow-up commits. Change-Id: Iec4ef1a057d412d22443312d40c6a8a290dc6144 Reviewed-on: Tested-by: Jenkins Reviewed-by: Stephan Bergmann <>
Diffstat (limited to 'writerfilter/source/rtftok/rtfdocumentimpl.cxx')
1 files changed, 2 insertions, 2 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 5971b8b8e96b..cf757dd58737 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2438,8 +2438,8 @@ RTFError RTFDocumentImpl::beforePopState(RTFParserState& rState)
OUString str(>makeStringAndClear());
// dmapper expects this as a field, so let's fake something...
auto const field((Destination::INDEXENTRY == rState.getDestination())
- ? OUStringLiteral("XE")
- : OUStringLiteral("TC"));
+ ? OUStringLiteral(u"XE")
+ : OUStringLiteral(u"TC"));
str = field + " \"" + str.replaceAll("\"", "\\\"") + "\"";
Mapper().utext(reinterpret_cast<sal_uInt8 const*>(str.getStr()), str.getLength());