From 33ecd0d5c4fff9511a8436513936a3f7044a775a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 27 Aug 2020 11:40:59 +0200 Subject: 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: https://gerrit.libreoffice.org/c/core/+/101483 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- drawinglayer/source/geometry/viewinformation2d.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'drawinglayer') diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx index 08a88b23d564..5067a33f2f75 100644 --- a/drawinglayer/source/geometry/viewinformation2d.cxx +++ b/drawinglayer/source/geometry/viewinformation2d.cxx @@ -34,12 +34,12 @@ namespace drawinglayer::geometry { namespace { -constexpr OUStringLiteral g_PropertyName_ObjectTransformation = "ObjectTransformation"; -constexpr OUStringLiteral g_PropertyName_ViewTransformation = "ViewTransformation"; -constexpr OUStringLiteral g_PropertyName_Viewport = "Viewport"; -constexpr OUStringLiteral g_PropertyName_Time = "Time"; -constexpr OUStringLiteral g_PropertyName_VisualizedPage = "VisualizedPage"; -constexpr OUStringLiteral g_PropertyName_ReducedDisplayQuality = "ReducedDisplayQuality"; +constexpr OUStringLiteral g_PropertyName_ObjectTransformation = u"ObjectTransformation"; +constexpr OUStringLiteral g_PropertyName_ViewTransformation = u"ViewTransformation"; +constexpr OUStringLiteral g_PropertyName_Viewport = u"Viewport"; +constexpr OUStringLiteral g_PropertyName_Time = u"Time"; +constexpr OUStringLiteral g_PropertyName_VisualizedPage = u"VisualizedPage"; +constexpr OUStringLiteral g_PropertyName_ReducedDisplayQuality = u"ReducedDisplayQuality"; } class ImpViewInformation2D -- cgit v1.2.3