From 1597cc5b3e07dd24cb4cb10b35b1e93545e4b929 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 29 Jul 2021 15:08:21 +0200 Subject: 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 --- UnoControls/source/controls/progressmonitor.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'UnoControls/source/controls/progressmonitor.cxx') diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx index fa7ab1aa7098..cf9160ee4556 100644 --- a/UnoControls/source/controls/progressmonitor.cxx +++ b/UnoControls/source/controls/progressmonitor.cxx @@ -39,14 +39,14 @@ using namespace ::com::sun::star::awt; using ::std::vector; -#define FIXEDTEXT_SERVICENAME "com.sun.star.awt.UnoControlFixedText" -#define FIXEDTEXT_MODELNAME "com.sun.star.awt.UnoControlFixedTextModel" -#define CONTROLNAME_TEXT "Text" // identifier the control in container -#define CONTROLNAME_PROGRESSBAR "ProgressBar" -#define BUTTON_SERVICENAME "com.sun.star.awt.UnoControlButton" -#define CONTROLNAME_BUTTON "Button" -#define BUTTON_MODELNAME "com.sun.star.awt.UnoControlButtonModel" -#define DEFAULT_BUTTONLABEL "Abbrechen" +constexpr OUStringLiteral FIXEDTEXT_SERVICENAME = u"com.sun.star.awt.UnoControlFixedText"; +constexpr OUStringLiteral FIXEDTEXT_MODELNAME = u"com.sun.star.awt.UnoControlFixedTextModel"; +constexpr OUStringLiteral CONTROLNAME_TEXT = u"Text"; // identifier the control in container +constexpr OUStringLiteral CONTROLNAME_PROGRESSBAR = u"ProgressBar"; +constexpr OUStringLiteral BUTTON_SERVICENAME = u"com.sun.star.awt.UnoControlButton"; +constexpr OUStringLiteral CONTROLNAME_BUTTON = u"Button"; +constexpr OUStringLiteral BUTTON_MODELNAME = u"com.sun.star.awt.UnoControlButtonModel"; +constexpr OUStringLiteral DEFAULT_BUTTONLABEL = u"Abbrechen"; namespace unocontrols { -- cgit