From e6dfaf9f44f9939abc338c83b3024108431d0f69 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 8 Sep 2020 09:48:17 +0200 Subject: Turn OUStringLiteral into a consteval'ed, static-refcound rtl_uString ...from which an OUString can cheaply be instantiated. This is the OUString equivalent of 4b9e440c51be3e40326bc90c33ae69885bfb51e4 "Turn OStringLiteral into a consteval'ed, static-refcound rtl_String". Most remarks about that commit apply here too (this commit is just substantially bigger and a bit more complicated because there were so much more uses of OUStringLiteral than of OStringLiteral): The one downside is that OUStringLiteral now needs to be a template abstracting over the string length. But any uses for which that is a problem (e.g., as the element type of a container that would no longer be homogeneous, or in the signature of a function that shall not be turned into a template for one reason or another) can be replaced with std::u16string_view, without loss of efficiency compared to the original OUStringLiteral, and without loss of expressivity. The new OUStringLiteral ctor code would probably not be very efficient if it were ever executed at runtime, but it is intended to be only executed at compile time. Where available, C++20 "consteval" is used to statically ensure that. The intended use of the new OUStringLiteral is in all cases where an object that shall itself not be an OUString (e.g., because it shall be a global static variable for which the OUString ctor/dtor would be detrimental at library load/unload) must be converted to an OUString instance in at least one place. Other string literal abstractions could use std::u16string_view (or just plain char16_t const[N]), but interestingly OUStringLiteral might be more efficient than constexpr std::u16string_view even for such cases, as it should not need any relocations at library load time. For now, no existing uses of OUStringLiteral have been changed to some other abstraction (unless technically necessary as discussed above), and no additional places that would benefit from OUStringLiteral have been changed to use it. Global constexpr OUStringLiteral variables defined in an included file would be somewhat suboptimal, as each translation unit that uses them would create its own, unshared instance. The envisioned solution is to turn them into static data members of some class (and there may be a loplugin coming to find and fix affected places). Another approach that has been taken here in a few cases where such variables were only used in one .cxx anyway is to move their definitions from the .hxx into that one .cxx (in turn causing some files to become empty and get removed completely)---which also silenced some GCC -Werror=unused-variable if a variable from a .hxx was not used in some .cxx including it. To keep individual commits reasonably manageable, some consumers of OUStringLiteral in rtl/ustrbuf.hxx and rtl/ustring.hxx are left in a somewhat odd state for now, where they don't take advantage of OUStringLiteral's equivalence to rtl_uString, but just keep extracting its contents and copy it elsewhere. In follow-up commits, those consumers should be changed appropriately, making them treat OUStringLiteral like an rtl_uString or dropping the OUStringLiteral overload in favor of an existing (and cheap to use now) OUString overload, etc. In a similar vein, comparison operators between OUString and std::u16string_view have been added to the existing plethora of comparison operator overloads. It would be nice to eventually consolidate them, esp. with the overloads taking OUStringLiteral and/or char16_t const[N] string literals, but that appears tricky to get right without introducing new ambiguities. Also, a handful of places across the code base use comparisons between OUString and OUStringNumber, which are now ambiguous (converting the OUStringNumber to either OUString or std::u16string_view). For simplicity, those few places have manually been fixed for now by adding explicit conversion to std::u16string_view. Also some compilerplugins code needed to be adapted, and some of the compilerplugins/test cases have become irrelevant (and have been removed), as the tested code would no longer compile in the first place. sal/qa/rtl/strings/test_oustring_concat.cxx documents a workaround for GCC bug "Failed class template argument deduction in unevaluated, parenthesized context". That place, as well as uses of OUStringLiteral in extensions/source/abpilot/fieldmappingimpl.cxx and i18npool/source/localedata/localedata.cxx, which have been replaced with OUString::Concat (and which is arguably a better choice, anyway), also caused failures with at least Clang 5.0.2 (but would not have caused failures with at least recent Clang 12 trunk, so appear to be bugs in Clang that have meanwhile been fixed). Change-Id: I34174462a28f2000cfeb2d219ffd533a767920b8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102222 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- .../controller/dialogs/ChartTypeDialogController.cxx | 20 ++++++++++---------- chart2/source/controller/dialogs/res_DataLabel.cxx | 6 +++++- 2 files changed, 15 insertions(+), 11 deletions(-) (limited to 'chart2/source/controller/dialogs') diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 7939fcf06c12..748df3e1b40e 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -401,7 +401,7 @@ OUString ColumnChartDialogController::getName() OUString ColumnChartDialogController::getImage() { - return OUStringLiteral(u"" BMP_TYPE_COLUMN); + return BMP_TYPE_COLUMN; } const tTemplateServiceChartTypeParameterMap& ColumnChartDialogController::getTemplateMap() const @@ -478,7 +478,7 @@ OUString BarChartDialogController::getName() OUString BarChartDialogController::getImage() { - return OUStringLiteral(u"" BMP_TYPE_BAR); + return BMP_TYPE_BAR; } const tTemplateServiceChartTypeParameterMap& BarChartDialogController::getTemplateMap() const @@ -554,7 +554,7 @@ OUString PieChartDialogController::getName() OUString PieChartDialogController::getImage() { - return OUStringLiteral(u"" BMP_TYPE_PIE); + return BMP_TYPE_PIE; } const tTemplateServiceChartTypeParameterMap& PieChartDialogController::getTemplateMap() const @@ -620,7 +620,7 @@ OUString LineChartDialogController::getName() OUString LineChartDialogController::getImage() { - return OUStringLiteral(u"" BMP_TYPE_LINE); + return BMP_TYPE_LINE; } const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTemplateMap() const @@ -767,7 +767,7 @@ OUString XYChartDialogController::getName() OUString XYChartDialogController::getImage() { - return OUStringLiteral(u"" BMP_TYPE_XY); + return BMP_TYPE_XY; } const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplateMap() const @@ -870,7 +870,7 @@ OUString AreaChartDialogController::getName() OUString AreaChartDialogController::getImage() { - return OUStringLiteral(u"" BMP_TYPE_AREA); + return BMP_TYPE_AREA; } bool AreaChartDialogController::shouldShow_3DLookControl() const @@ -957,7 +957,7 @@ OUString NetChartDialogController::getName() OUString NetChartDialogController::getImage() { - return OUStringLiteral(u"" BMP_TYPE_NET); + return BMP_TYPE_NET; } bool NetChartDialogController::shouldShow_StackingControl() const @@ -1052,7 +1052,7 @@ OUString StockChartDialogController::getName() OUString StockChartDialogController::getImage() { - return OUStringLiteral(u"" BMP_TYPE_STOCK); + return BMP_TYPE_STOCK; } const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemplateMap() const @@ -1097,7 +1097,7 @@ OUString CombiColumnLineChartDialogController::getName() OUString CombiColumnLineChartDialogController::getImage() { - return OUStringLiteral(u"" BMP_TYPE_COLUMN_LINE); + return BMP_TYPE_COLUMN_LINE; } const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogController::getTemplateMap() const @@ -1227,7 +1227,7 @@ OUString BubbleChartDialogController::getName() OUString BubbleChartDialogController::getImage() { - return OUStringLiteral(u"" BMP_TYPE_BUBBLE); + return BMP_TYPE_BUBBLE; } const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTemplateMap() const diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index 62568fc71296..281beb86dd6f 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include + +#include + #include "res_DataLabel.hxx" #include @@ -39,7 +43,7 @@ namespace chart namespace { -const OUStringLiteral our_aLBEntryMap[] = {u" ", u", ", u"; ", u"\n", u". "}; +const std::u16string_view our_aLBEntryMap[] = {u" ", u", ", u"; ", u"\n", u". "}; bool lcl_ReadNumberFormatFromItemSet( const SfxItemSet& rSet, sal_uInt16 nValueWhich, sal_uInt16 nSourceFormatWhich, sal_uLong& rnFormatKeyOut, bool& rbSourceFormatOut, bool& rbSourceFormatMixedStateOut ) { -- cgit