diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-29 15:08:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-02 14:43:58 +0200 |
| commit | 1597cc5b3e07dd24cb4cb10b35b1e93545e4b929 (patch) | |
| tree | f6ed37244e41d23e8a84327b1580e37f3dc18829 /cui | |
| parent | 0e883d6dbee8d72257f77605ae0c8a1d5bfbf044 (diff) | |
convert #defines to OUStringLiteral
mostly by doing
$ git grep -l '#define.*\"' -- *.cxx
| xargs perl -pi -e
's/^#define\s+(\w+)\s+(\".*\")/constexpr OUStringLiteral \1 =
u\2;/g'
Change-Id: Idface893449b0ef2a3c5254865a300585d752fbb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119669
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/dialogs/hlmarkwn.cxx | 6 | ||||
| -rw-r--r-- | cui/source/dialogs/showcols.cxx | 4 | ||||
| -rw-r--r-- | cui/source/options/optpath.cxx | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 2d2fb8ac943d..45b9a75eb2eb 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -158,9 +158,9 @@ namespace } } -#define TG_SETTING_MANAGER "TargetInDocument" -#define TG_SETTING_LASTMARK "LastSelectedMark" -#define TG_SETTING_LASTPATH "LastSelectedPath" +constexpr OUStringLiteral TG_SETTING_MANAGER = u"TargetInDocument"; +constexpr OUStringLiteral TG_SETTING_LASTMARK = u"LastSelectedMark"; +constexpr OUStringLiteral TG_SETTING_LASTPATH = u"LastSelectedPath"; void SvxHlinkDlgMarkWnd::RestoreLastSelection() { diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index a567a84010dc..b089f5f8e14b 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -25,8 +25,8 @@ #include <tools/debug.hxx> #include <tools/diagnose_ex.h> -#define CUIFM_PROP_HIDDEN "Hidden" -#define CUIFM_PROP_LABEL "Label" +constexpr OUStringLiteral CUIFM_PROP_HIDDEN = u"Hidden"; +constexpr OUStringLiteral CUIFM_PROP_LABEL = u"Label"; FmShowColsDialog::FmShowColsDialog(weld::Window* pParent) : GenericDialogController(pParent, "cui/ui/showcoldialog.ui", "ShowColDialog") diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 1670dfb91d82..590ff2eb05c5 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -52,11 +52,11 @@ using namespace svx; // define ---------------------------------------------------------------- -#define POSTFIX_INTERNAL "_internal" -#define POSTFIX_USER "_user" -#define POSTFIX_WRITABLE "_writable" -#define VAR_ONE "%1" -#define IODLG_CONFIGNAME "FilePicker_Save" +constexpr OUStringLiteral POSTFIX_INTERNAL = u"_internal"; +constexpr OUStringLiteral POSTFIX_USER = u"_user"; +constexpr OUStringLiteral POSTFIX_WRITABLE = u"_writable"; +constexpr OUStringLiteral VAR_ONE = u"%1"; +constexpr OUStringLiteral IODLG_CONFIGNAME = u"FilePicker_Save"; // struct OptPath_Impl --------------------------------------------------- |