formula/inc/bitmaps.hlst | 12 ++++----
fpicker/inc/bitmaps.hlst | 6 ++--
fpicker/source/office/fpdialogbase.hxx | 2 -
fpicker/source/win32/VistaFilePickerImpl.hxx | 40 +++++++++++++--------------
4 files changed, 30 insertions(+), 30 deletions(-)
New commits:
commit 0abde637728e53883939f028551c6de5aa215d50
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Nov 24 13:29:31 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Nov 24 14:58:15 2021 +0100
loplugin:stringliteraldefine in formual,fpicker
Change-Id: I663a31ff6b207f43dd6f1c8240a341845b9e20b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125764
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/formula/inc/bitmaps.hlst b/formula/inc/bitmaps.hlst
index 811354b21f5a..d06d785cc3ec 100644
--- a/formula/inc/bitmaps.hlst
+++ b/formula/inc/bitmaps.hlst
@@ -10,11 +10,11 @@
#pragma once
#define BMP_STR_CLOSE "formula/res/fapclose.png"
-#define BMP_STR_OPEN "formula/res/fapopen.png"
-#define BMP_STR_END "formula/res/fapok.png"
-#define BMP_STR_ERROR "formula/res/faperror.png"
-#define RID_BMP_REFBTN1 "formula/res/refinp1.png"
-#define RID_BMP_REFBTN2 "formula/res/refinp2.png"
-#define BMP_FX "formula/res/fx.png"
+inline constexpr OUStringLiteral BMP_STR_OPEN = u"formula/res/fapopen.png";
+inline constexpr OUStringLiteral BMP_STR_END = u"formula/res/fapok.png";
+inline constexpr OUStringLiteral BMP_STR_ERROR = u"formula/res/faperror.png";
+inline constexpr OUStringLiteral RID_BMP_REFBTN1 = u"formula/res/refinp1.png";
+inline constexpr OUStringLiteral RID_BMP_REFBTN2 = u"formula/res/refinp2.png";
+inline constexpr OUStringLiteral BMP_FX = u"formula/res/fx.png";
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/fpicker/inc/bitmaps.hlst b/fpicker/inc/bitmaps.hlst
index b7841db8813e..57d8ed0db6c6 100644
--- a/fpicker/inc/bitmaps.hlst
+++ b/fpicker/inc/bitmaps.hlst
@@ -10,8 +10,8 @@
#pragma once
#define RID_BMP_FOLDER_OPEN "res/folderop.png"
-#define BMP_FILEDLG_PLACE_LOCAL "fpicker/res/fp015.png"
-#define BMP_FILEDLG_PLACE_REMOTE "fpicker/res/fp016.png"
-#define RID_BMP_FOLDER "svtools/res/folder.png"
+inline constexpr OUStringLiteral BMP_FILEDLG_PLACE_LOCAL =
u"fpicker/res/fp015.png";
+inline constexpr OUStringLiteral BMP_FILEDLG_PLACE_REMOTE =
u"fpicker/res/fp016.png";
+inline constexpr OUStringLiteral RID_BMP_FOLDER = u"svtools/res/folder.png";
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/fpicker/source/office/fpdialogbase.hxx
b/fpicker/source/office/fpdialogbase.hxx
index ec9dbb0d5f4a..20ab362971f4 100644
--- a/fpicker/source/office/fpdialogbase.hxx
+++ b/fpicker/source/office/fpdialogbase.hxx
@@ -52,7 +52,7 @@ namespace o3tl {
template<> struct typed_flags<PickerFlags> : is_typed_flags<PickerFlags,
0x00ffff> {};
}
-#define FILEDIALOG_FILTER_ALL "*.*"
+inline constexpr OUStringLiteral FILEDIALOG_FILTER_ALL = u"*.*";
// SvtFileDialog_Base
diff --git a/fpicker/source/win32/VistaFilePickerImpl.hxx
b/fpicker/source/win32/VistaFilePickerImpl.hxx
index 78941886e235..8e757c9c66ac 100644
--- a/fpicker/source/win32/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/VistaFilePickerImpl.hxx
@@ -57,26 +57,26 @@ const ::sal_Int32 FEATURE_VERSION = 1024;
const ::sal_Int32 FEATURE_GPGPASSWORD = 2048;
const ::sal_Int32 FEATURE_IMAGEANCHOR = 4096;
-constexpr OUStringLiteral PROP_PICKER_LISTENER(u"picker_listener" ); //
[XFilePickerListenert]
-constexpr OUStringLiteral PROP_DIALOG_SHOW_RESULT(u"dialog_show_result" ); //
[sal_Bool] true=OK, false=CANCEL
-constexpr OUStringLiteral PROP_SELECTED_FILES(u"selected_files" ); //
[seq< OUString >] contains all user selected files (can be empty!)
-constexpr OUStringLiteral PROP_MULTISELECTION_MODE(u"multiselection_mode"); //
[sal_Bool] true=ON, false=OFF
-constexpr OUStringLiteral PROP_TITLE(u"title" ); // [OUString]
-constexpr OUStringLiteral PROP_FILENAME(u"filename" ); // [OUString]
-constexpr OUStringLiteral PROP_DIRECTORY(u"directory" ); // [OUString]
-constexpr OUStringLiteral PROP_FEATURES(u"features" ); // [sal_Int32]
-constexpr OUStringLiteral PROP_TEMPLATE_DESCR(u"templatedescription"); //
[sal_Int32]
-constexpr OUStringLiteral PROP_FILTER_TITLE(u"filter_title" ); //
[OUString]
-constexpr OUStringLiteral PROP_FILTER_VALUE(u"filter_value" ); //
[OUString]
-constexpr OUStringLiteral PROP_FILTER_GROUP(u"filter-group" ); // [seq<
css:beans::StringPair >] contains a group of filters
-
-constexpr OUStringLiteral PROP_CONTROL_ID(u"control_id" ); //
[sal_Int16]
-constexpr OUStringLiteral PROP_CONTROL_ACTION(u"control_action" ); //
[sal_Int16]
-constexpr OUStringLiteral PROP_CONTROL_VALUE(u"control_value" ); // [Any]
-constexpr OUStringLiteral PROP_CONTROL_LABEL(u"control_label" ); //
[OUString]
-constexpr OUStringLiteral PROP_CONTROL_ENABLE(u"control_enable" ); //
[sal_Bool] true=ON, false=OFF
-constexpr OUStringLiteral PROP_PARENT_WINDOW(u"ParentWindow");
//[css::awt::XWindow] preferred parent window
-constexpr OUStringLiteral
STRING_SEPARATOR(u"------------------------------------------" );
+inline constexpr OUStringLiteral PROP_PICKER_LISTENER(u"picker_listener" );
// [XFilePickerListenert]
+inline constexpr OUStringLiteral PROP_DIALOG_SHOW_RESULT(u"dialog_show_result"
); // [sal_Bool] true=OK, false=CANCEL
+inline constexpr OUStringLiteral PROP_SELECTED_FILES(u"selected_files" );
// [seq< OUString >] contains all user selected files (can be empty!)
+inline constexpr OUStringLiteral
PROP_MULTISELECTION_MODE(u"multiselection_mode"); // [sal_Bool] true=ON,
false=OFF
+inline constexpr OUStringLiteral PROP_TITLE(u"title" ); //
[OUString]
+inline constexpr OUStringLiteral PROP_FILENAME(u"filename" ); //
[OUString]
+inline constexpr OUStringLiteral PROP_DIRECTORY(u"directory" ); //
[OUString]
+inline constexpr OUStringLiteral PROP_FEATURES(u"features" ); //
[sal_Int32]
+inline constexpr OUStringLiteral PROP_TEMPLATE_DESCR(u"templatedescription");
// [sal_Int32]
+inline constexpr OUStringLiteral PROP_FILTER_TITLE(u"filter_title" ); //
[OUString]
+inline constexpr OUStringLiteral PROP_FILTER_VALUE(u"filter_value" ); //
[OUString]
+inline constexpr OUStringLiteral PROP_FILTER_GROUP(u"filter-group" ); //
[seq< css:beans::StringPair >] contains a group of filters
+
+inline constexpr OUStringLiteral PROP_CONTROL_ID(u"control_id" ); //
[sal_Int16]
+inline constexpr OUStringLiteral PROP_CONTROL_ACTION(u"control_action" );
// [sal_Int16]
+inline constexpr OUStringLiteral PROP_CONTROL_VALUE(u"control_value" );
// [Any]
+inline constexpr OUStringLiteral PROP_CONTROL_LABEL(u"control_label" );
// [OUString]
+inline constexpr OUStringLiteral PROP_CONTROL_ENABLE(u"control_enable" );
// [sal_Bool] true=ON, false=OFF
+inline constexpr OUStringLiteral PROP_PARENT_WINDOW(u"ParentWindow");
//[css::awt::XWindow] preferred parent window
+inline constexpr OUStringLiteral
STRING_SEPARATOR(u"------------------------------------------" );
class TDialogImplBase;
