diff options
| author | Jeff Huang <jeff@mail.ossii.com.tw> | 2021-11-05 10:49:09 +0800 |
|---|---|---|
| committer | Hossein <hossein@libreoffice.org> | 2021-11-25 15:57:44 +0100 |
| commit | 7b0e0409c3f24dfe37d9c43ffa439b56ea719868 (patch) | |
| tree | 549e2dea23efd239384cdb9e8d1de30dd3f631f7 | |
| parent | sw: allow viewing OLE objects in protected sections (diff) | |
| download | core-7b0e0409c3f24dfe37d9c43ffa439b56ea719868.tar.gz core-7b0e0409c3f24dfe37d9c43ffa439b56ea719868.zip | |
tdf#145539 const OUString -> constexpr OUStringLiteral
Convert string literals defined as const char[] in header files
to constexpr OUStringLiteral
Change-Id: I69fdc34cfb663ff87fabc8efc72d6563aa23465b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124724
Tested-by: Jenkins
Reviewed-by: Hossein <hossein@libreoffice.org>
| -rw-r--r-- | cui/source/inc/cfg.hxx | 4 | ||||
| -rw-r--r-- | vbahelper/source/vbahelper/vbacommandbarhelper.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 730c6f0ad234..361e801d723c 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -48,7 +48,7 @@ inline constexpr OUStringLiteral ITEM_DESCRIPTOR_LABEL = u"Label"; inline constexpr OUStringLiteral ITEM_DESCRIPTOR_TYPE = u"Type"; inline constexpr OUStringLiteral ITEM_DESCRIPTOR_STYLE = u"Style"; inline constexpr OUStringLiteral ITEM_DESCRIPTOR_ISVISIBLE = u"IsVisible"; -const char ITEM_DESCRIPTOR_RESOURCEURL[] = "ResourceURL"; +inline constexpr OUStringLiteral ITEM_DESCRIPTOR_RESOURCEURL = u"ResourceURL"; inline constexpr OUStringLiteral ITEM_DESCRIPTOR_UINAME = u"UIName"; inline constexpr OUStringLiteral ITEM_MENUBAR_URL = u"private:resource/menubar/menubar"; @@ -56,7 +56,7 @@ inline constexpr OUStringLiteral ITEM_TOOLBAR_URL = u"private:resource/toolbar/" inline constexpr OUStringLiteral CUSTOM_TOOLBAR_STR = u"custom_toolbar_"; -const char aMenuSeparatorStr[] = " | "; +inline constexpr OUStringLiteral aMenuSeparatorStr = u" | "; class SvxConfigEntry; class SvxConfigPage; diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx index 8eda1dbafc3e..c177385cc285 100644 --- a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx +++ b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx @@ -40,8 +40,8 @@ inline constexpr OUStringLiteral ITEM_DESCRIPTOR_ENABLED = u"Enabled"; inline constexpr OUStringLiteral ITEM_MENUBAR_URL = u"private:resource/menubar/menubar"; constexpr char16_t ITEM_TOOLBAR_URL[] = u"private:resource/toolbar/"; -const char CUSTOM_TOOLBAR_STR[] = "custom_toolbar_"; -const char CUSTOM_MENU_STR[] = "vnd.openoffice.org:CustomMenu"; +inline constexpr OUStringLiteral CUSTOM_TOOLBAR_STR = u"custom_toolbar_"; +inline constexpr OUStringLiteral CUSTOM_MENU_STR = u"vnd.openoffice.org:CustomMenu"; class VbaCommandBarHelper; typedef std::shared_ptr< VbaCommandBarHelper > VbaCommandBarHelperRef; |