loplugin:stringstatic, lopluign:ostr (clang-cl)

Change-Id: I7a928a2385286f6d1ab3887c8d315af3f47c052d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159135
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

2 files changed, 22 insertions, 22 deletions

diff --git a/fpicker/source/win32/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/VistaFilePickerEventHandler.cxx
index 97c0c9fbd41e..7c21dcde0392 100644
--- a/fpicker/source/win32/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/VistaFilePickerEventHandler.cxx
@@ -231,8 +231,8 @@ void VistaFilePickerEventHandler::stopListening()
     }
 }
 
-const OUStringLiteral PROP_CONTROL_ID = u"control_id";
-const OUStringLiteral PROP_PICKER_LISTENER = u"picker_listener";
+constexpr OUString PROP_CONTROL_ID = u"control_id"_ustr;
+constexpr OUString PROP_PICKER_LISTENER = u"picker_listener"_ustr;
 
 namespace {
 
diff --git a/fpicker/source/win32/VistaFilePickerImpl.hxx b/fpicker/source/win32/VistaFilePickerImpl.hxx
index 8e757c9c66ac..8ea9468076ea 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;
 
-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"------------------------------------------" );
+inline constexpr OUString PROP_PICKER_LISTENER(u"picker_listener"_ustr   ); // [XFilePickerListenert]
+inline constexpr OUString PROP_DIALOG_SHOW_RESULT(u"dialog_show_result"_ustr ); // [sal_Bool] true=OK, false=CANCEL
+inline constexpr OUString PROP_SELECTED_FILES(u"selected_files"_ustr     ); // [seq< OUString >] contains all user selected files (can be empty!)
+inline constexpr OUString PROP_MULTISELECTION_MODE(u"multiselection_mode"_ustr); // [sal_Bool] true=ON, false=OFF
+inline constexpr OUString PROP_TITLE(u"title"_ustr              ); // [OUString]
+inline constexpr OUString PROP_FILENAME(u"filename"_ustr          ); // [OUString]
+inline constexpr OUString PROP_DIRECTORY(u"directory"_ustr          ); // [OUString]
+inline constexpr OUString PROP_FEATURES(u"features"_ustr           ); // [sal_Int32]
+inline constexpr OUString PROP_TEMPLATE_DESCR(u"templatedescription"_ustr); // [sal_Int32]
+inline constexpr OUString PROP_FILTER_TITLE(u"filter_title"_ustr       ); // [OUString]
+inline constexpr OUString PROP_FILTER_VALUE(u"filter_value"_ustr       ); // [OUString]
+inline constexpr OUString PROP_FILTER_GROUP(u"filter-group"_ustr       ); // [seq< css:beans::StringPair >] contains a group of filters
+
+inline constexpr OUString PROP_CONTROL_ID(u"control_id"_ustr         ); // [sal_Int16]
+inline constexpr OUString PROP_CONTROL_ACTION(u"control_action"_ustr     ); // [sal_Int16]
+inline constexpr OUString PROP_CONTROL_VALUE(u"control_value"_ustr      ); // [Any]
+inline constexpr OUString PROP_CONTROL_LABEL(u"control_label"_ustr      ); // [OUString]
+inline constexpr OUString PROP_CONTROL_ENABLE(u"control_enable"_ustr     ); // [sal_Bool] true=ON, false=OFF
+inline constexpr OUString PROP_PARENT_WINDOW(u"ParentWindow"_ustr); //[css::awt::XWindow] preferred parent window
+inline constexpr OUString STRING_SEPARATOR(u"------------------------------------------"_ustr );
 
 class TDialogImplBase;