diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2020-08-27 11:40:59 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2020-08-28 08:07:09 +0200 |
commit | 33ecd0d5c4fff9511a8436513936a3f7044a775a (patch) | |
tree | c25809adda140ff89d9f2a2b6dfadba17e188fb0 /test | |
parent | 554834484a3323f73b5aeace246bcd9635368967 (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: https://gerrit.libreoffice.org/c/core/+/101483
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'test')
-rw-r--r-- | test/source/screenshot_test.cxx | 2 | ||||
-rw-r--r-- | test/source/sheet/xsheetoutline.cxx | 12 | ||||
-rw-r--r-- | test/source/sheet/xspreadsheets2.cxx | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/test/source/screenshot_test.cxx b/test/source/screenshot_test.cxx index 9d02a67b896b..3b91038fda48 100644 --- a/test/source/screenshot_test.cxx +++ b/test/source/screenshot_test.cxx @@ -40,7 +40,7 @@ using namespace css; using namespace css::uno; /// the target directory for screenshots -constexpr OUStringLiteral g_aScreenshotDirectory("screenshots"); +constexpr OUStringLiteral g_aScreenshotDirectory(u"screenshots"); ScreenshotTest::ScreenshotTest() : maKnownDialogs() diff --git a/test/source/sheet/xsheetoutline.cxx b/test/source/sheet/xsheetoutline.cxx index 82b690605b07..c07fd866b05d 100644 --- a/test/source/sheet/xsheetoutline.cxx +++ b/test/source/sheet/xsheetoutline.cxx @@ -28,13 +28,13 @@ using namespace css::uno; namespace apitest { -const OUStringLiteral colLevel1 = "OutlineSheet.A1:Z1"; -const OUStringLiteral colLevel2 = "OutlineSheet.C1:W1"; -const OUStringLiteral colLevel3 = "OutlineSheet.E1:U1"; -const OUStringLiteral colLevel4 = "OutlineSheet.G1:S1"; +const OUStringLiteral colLevel1 = u"OutlineSheet.A1:Z1"; +const OUStringLiteral colLevel2 = u"OutlineSheet.C1:W1"; +const OUStringLiteral colLevel3 = u"OutlineSheet.E1:U1"; +const OUStringLiteral colLevel4 = u"OutlineSheet.G1:S1"; -const OUStringLiteral rowLevel1 = "OutlineSheet.A1:A30"; -const OUStringLiteral rowLevel2 = "OutlineSheet.A3:A27"; +const OUStringLiteral rowLevel1 = u"OutlineSheet.A1:A30"; +const OUStringLiteral rowLevel2 = u"OutlineSheet.A3:A27"; static OUString getVisibleAdress( uno::Reference<sheet::XSpreadsheet> const& xSheet, diff --git a/test/source/sheet/xspreadsheets2.cxx b/test/source/sheet/xspreadsheets2.cxx index d494e40c5136..98070812b2b9 100644 --- a/test/source/sheet/xspreadsheets2.cxx +++ b/test/source/sheet/xspreadsheets2.cxx @@ -32,9 +32,9 @@ using namespace css::uno; namespace apitest { -constexpr OUStringLiteral gaSrcSheetName("SheetToCopy"); -constexpr OUStringLiteral gaSrcFileName("rangenamessrc.ods"); -constexpr OUStringLiteral gaDestFileBase("ScNamedRangeObj.ods"); +constexpr OUStringLiteral gaSrcSheetName(u"SheetToCopy"); +constexpr OUStringLiteral gaSrcFileName(u"rangenamessrc.ods"); +constexpr OUStringLiteral gaDestFileBase(u"ScNamedRangeObj.ods"); static sal_Int32 nInsertedSheets(0); |