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 /cui | |
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 'cui')
-rw-r--r-- | cui/source/dialogs/colorpicker.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/scriptdlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/inc/cfg.hxx | 2 | ||||
-rw-r--r-- | cui/source/options/dbregister.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/treeopt.cxx | 26 | ||||
-rw-r--r-- | cui/source/tabpages/border.cxx | 74 |
6 files changed, 55 insertions, 55 deletions
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 2dc7e779740c..c7ba64437b24 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -1247,8 +1247,8 @@ com_sun_star_cui_ColorPicker_get_implementation( } -const OUStringLiteral gsColorKey( "Color" ); -const OUStringLiteral gsModeKey( "Mode" ); +const OUStringLiteral gsColorKey( u"Color" ); +const OUStringLiteral gsModeKey( u"Mode" ); ColorPicker::ColorPicker() : ColorPickerBase( m_aMutex ) diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index ed09844aa771..6a2a81bcc89e 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -194,7 +194,7 @@ void SvxScriptOrgDialog::Init( const OUString& language ) Reference< browse::XBrowseNode > langEntries = getLangNodeFromRootNode( childNode, language ); - insertEntry( uiName, app ? OUStringLiteral(RID_CUIBMP_HARDDISK) : OUStringLiteral(RID_CUIBMP_DOC), + insertEntry( uiName, app ? OUStringLiteral(u"" RID_CUIBMP_HARDDISK) : OUStringLiteral(u"" RID_CUIBMP_DOC), nullptr, true, std::make_unique< SFEntry >( langEntries, xDocumentModel ), factoryURL, false ); } diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 699434ac04fa..430822380296 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -51,7 +51,7 @@ const char ITEM_DESCRIPTOR_RESOURCEURL[] = "ResourceURL"; const char ITEM_DESCRIPTOR_UINAME[] = "UIName"; const char ITEM_MENUBAR_URL[] = "private:resource/menubar/menubar"; -const char ITEM_TOOLBAR_URL[] = "private:resource/toolbar/"; +const char16_t ITEM_TOOLBAR_URL[] = u"private:resource/toolbar/"; const char CUSTOM_TOOLBAR_STR[] = "custom_toolbar_"; diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index d3b1ccc90013..7bcf13435bbf 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -183,7 +183,7 @@ void DbRegistrationOptionsPage::FillUserData() { OUString aUserData = OUString::number( m_xPathBox->get_column_width(COL_TYPE) ) + ";"; bool bUp = m_xPathBox->get_sort_order(); - aUserData += (bUp ? OUStringLiteral("1") : OUStringLiteral("0")); + aUserData += (bUp ? OUStringLiteral(u"1") : OUStringLiteral(u"0")); SetUserData( aUserData ); } diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index b0fb03d27cb5..55447259e940 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -115,7 +115,7 @@ using namespace ::com::sun::star::util; LastPageSaver* OfaTreeOptionsDialog::pLastPageSaver = nullptr; // some stuff for easier changes for SvtViewOptions -const OUStringLiteral VIEWOPT_DATANAME = "page data"; +const OUStringLiteral VIEWOPT_DATANAME = u"page data"; static void SetViewOptUserItem( SvtViewOptions& rOpt, const OUString& rData ) { @@ -143,18 +143,18 @@ struct ModuleToGroupNameMap_Impl static ModuleToGroupNameMap_Impl ModuleMap[] = { - { "ProductName", OUString(), SID_GENERAL_OPTIONS }, - { "LanguageSettings", OUString(), SID_LANGUAGE_OPTIONS }, - { "Internet", OUString(), SID_INET_DLG }, - { "LoadSave", OUString(), SID_FILTER_DLG }, - { "Writer", OUString(), SID_SW_EDITOPTIONS }, - { "WriterWeb", OUString(), SID_SW_ONLINEOPTIONS }, - { "Math", OUString(), SID_SM_EDITOPTIONS }, - { "Calc", OUString(), SID_SC_EDITOPTIONS }, - { "Impress", OUString(), SID_SD_EDITOPTIONS }, - { "Draw", OUString(), SID_SD_GRAPHIC_OPTIONS }, - { "Charts", OUString(), SID_SCH_EDITOPTIONS }, - { "Base", OUString(), SID_SB_STARBASEOPTIONS }, + { u"ProductName", OUString(), SID_GENERAL_OPTIONS }, + { u"LanguageSettings", OUString(), SID_LANGUAGE_OPTIONS }, + { u"Internet", OUString(), SID_INET_DLG }, + { u"LoadSave", OUString(), SID_FILTER_DLG }, + { u"Writer", OUString(), SID_SW_EDITOPTIONS }, + { u"WriterWeb", OUString(), SID_SW_ONLINEOPTIONS }, + { u"Math", OUString(), SID_SM_EDITOPTIONS }, + { u"Calc", OUString(), SID_SC_EDITOPTIONS }, + { u"Impress", OUString(), SID_SD_EDITOPTIONS }, + { u"Draw", OUString(), SID_SD_GRAPHIC_OPTIONS }, + { u"Charts", OUString(), SID_SCH_EDITOPTIONS }, + { u"Base", OUString(), SID_SB_STARBASEOPTIONS }, }; static void setGroupName( const OUString& rModule, const OUString& rGroupName ) diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index d7a58be2f7ef..d192f1054474 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -282,41 +282,41 @@ SvxBorderTabPage::SvxBorderTabPage(weld::Container* pPage, weld::DialogControlle if (comphelper::LibreOfficeKit::isActive()) { aBorderImageIds.insert(aBorderImageIds.end(), { - RID_SVXBMP_CELL_NONE_32, - RID_SVXBMP_CELL_ALL_32, - RID_SVXBMP_CELL_LR_32, - RID_SVXBMP_CELL_TB_32, - RID_SVXBMP_CELL_L_32, - RID_SVXBMP_CELL_DIAG_32 + u"" RID_SVXBMP_CELL_NONE_32, + u"" RID_SVXBMP_CELL_ALL_32, + u"" RID_SVXBMP_CELL_LR_32, + u"" RID_SVXBMP_CELL_TB_32, + u"" RID_SVXBMP_CELL_L_32, + u"" RID_SVXBMP_CELL_DIAG_32 }); } else { aBorderImageIds.insert(aBorderImageIds.end(), { - RID_SVXBMP_CELL_NONE, - RID_SVXBMP_CELL_ALL, - RID_SVXBMP_CELL_LR, - RID_SVXBMP_CELL_TB, - RID_SVXBMP_CELL_L, - RID_SVXBMP_CELL_DIAG + u"" RID_SVXBMP_CELL_NONE, + u"" RID_SVXBMP_CELL_ALL, + u"" RID_SVXBMP_CELL_LR, + u"" RID_SVXBMP_CELL_TB, + u"" RID_SVXBMP_CELL_L, + u"" RID_SVXBMP_CELL_DIAG }); } aBorderImageIds.insert(aBorderImageIds.end(), { - RID_SVXBMP_HOR_NONE, - RID_SVXBMP_HOR_OUTER, - RID_SVXBMP_HOR_HOR, - RID_SVXBMP_HOR_ALL, - RID_SVXBMP_HOR_OUTER2, - RID_SVXBMP_VER_NONE, - RID_SVXBMP_VER_OUTER, - RID_SVXBMP_VER_VER, - RID_SVXBMP_VER_ALL, - RID_SVXBMP_VER_OUTER2, - RID_SVXBMP_TABLE_NONE, - RID_SVXBMP_TABLE_OUTER, - RID_SVXBMP_TABLE_OUTERH, - RID_SVXBMP_TABLE_ALL, - RID_SVXBMP_TABLE_OUTER2 + u"" RID_SVXBMP_HOR_NONE, + u"" RID_SVXBMP_HOR_OUTER, + u"" RID_SVXBMP_HOR_HOR, + u"" RID_SVXBMP_HOR_ALL, + u"" RID_SVXBMP_HOR_OUTER2, + u"" RID_SVXBMP_VER_NONE, + u"" RID_SVXBMP_VER_OUTER, + u"" RID_SVXBMP_VER_VER, + u"" RID_SVXBMP_VER_ALL, + u"" RID_SVXBMP_VER_OUTER2, + u"" RID_SVXBMP_TABLE_NONE, + u"" RID_SVXBMP_TABLE_OUTER, + u"" RID_SVXBMP_TABLE_OUTERH, + u"" RID_SVXBMP_TABLE_ALL, + u"" RID_SVXBMP_TABLE_OUTER2 }); } @@ -329,21 +329,21 @@ SvxBorderTabPage::SvxBorderTabPage(weld::Container* pPage, weld::DialogControlle if (comphelper::LibreOfficeKit::isActive()) { aShadowImageIds.insert(aShadowImageIds.end(), { - RID_SVXBMP_SHADOWNONE_32, - RID_SVXBMP_SHADOW_BOT_RIGHT_32, - RID_SVXBMP_SHADOW_TOP_RIGHT_32, - RID_SVXBMP_SHADOW_BOT_LEFT_32, - RID_SVXBMP_SHADOW_TOP_LEFT_32 + u"" RID_SVXBMP_SHADOWNONE_32, + u"" RID_SVXBMP_SHADOW_BOT_RIGHT_32, + u"" RID_SVXBMP_SHADOW_TOP_RIGHT_32, + u"" RID_SVXBMP_SHADOW_BOT_LEFT_32, + u"" RID_SVXBMP_SHADOW_TOP_LEFT_32 }); } else { aShadowImageIds.insert(aShadowImageIds.end(), { - RID_SVXBMP_SHADOWNONE, - RID_SVXBMP_SHADOW_BOT_RIGHT, - RID_SVXBMP_SHADOW_TOP_RIGHT, - RID_SVXBMP_SHADOW_BOT_LEFT, - RID_SVXBMP_SHADOW_TOP_LEFT + u"" RID_SVXBMP_SHADOWNONE, + u"" RID_SVXBMP_SHADOW_BOT_RIGHT, + u"" RID_SVXBMP_SHADOW_TOP_RIGHT, + u"" RID_SVXBMP_SHADOW_BOT_LEFT, + u"" RID_SVXBMP_SHADOW_TOP_LEFT }); } } |