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>

6 files changed, 43 insertions, 43 deletions

diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx
index ad6202cf1479..b11d4648383d 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -38,18 +38,18 @@
 // #define this to true, if remembering defaults is not supported properly
 #define RTL_BOOTSTRAP_DEFAULTS_BROKEN true
 
-#define BOOTSTRAP_ITEM_PRODUCT_KEY          "ProductKey"
-#define BOOTSTRAP_ITEM_VERSIONFILE          "Location"
-#define BOOTSTRAP_ITEM_BUILDID              "buildid"
+constexpr OUStringLiteral BOOTSTRAP_ITEM_PRODUCT_KEY = u"ProductKey";
+constexpr OUStringLiteral BOOTSTRAP_ITEM_VERSIONFILE = u"Location";
+constexpr OUStringLiteral BOOTSTRAP_ITEM_BUILDID = u"buildid";
 
-#define BOOTSTRAP_ITEM_BASEINSTALLATION     "BRAND_BASE_DIR"
-#define BOOTSTRAP_ITEM_USERINSTALLATION     "UserInstallation"
+constexpr OUStringLiteral BOOTSTRAP_ITEM_BASEINSTALLATION = u"BRAND_BASE_DIR";
+constexpr OUStringLiteral BOOTSTRAP_ITEM_USERINSTALLATION = u"UserInstallation";
 
-#define BOOTSTRAP_ITEM_USERDIR              "UserDataDir"
+constexpr OUStringLiteral BOOTSTRAP_ITEM_USERDIR = u"UserDataDir";
 
-#define BOOTSTRAP_DEFAULT_BASEINSTALL       "$SYSBINDIR/.."
+constexpr OUStringLiteral BOOTSTRAP_DEFAULT_BASEINSTALL = u"$SYSBINDIR/..";
 
-#define BOOTSTRAP_DIRNAME_USERDIR           u"user"
+constexpr OUStringLiteral BOOTSTRAP_DIRNAME_USERDIR = u"user";
 
 typedef char const * AsciiString;
 
diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx
index 907d91e4642a..14ce7bb87aa5 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -34,15 +34,15 @@
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 
-#define DYNAMICMENU_PROPERTYNAME_URL                    "URL"
-#define DYNAMICMENU_PROPERTYNAME_TITLE                  "Title"
-#define DYNAMICMENU_PROPERTYNAME_IMAGEIDENTIFIER        "ImageIdentifier"
-#define DYNAMICMENU_PROPERTYNAME_TARGETNAME             "TargetName"
+constexpr OUStringLiteral DYNAMICMENU_PROPERTYNAME_URL = u"URL";
+constexpr OUStringLiteral DYNAMICMENU_PROPERTYNAME_TITLE = u"Title";
+constexpr OUStringLiteral DYNAMICMENU_PROPERTYNAME_IMAGEIDENTIFIER = u"ImageIdentifier";
+constexpr OUStringLiteral DYNAMICMENU_PROPERTYNAME_TARGETNAME = u"TargetName";
 
-#define PATHDELIMITER                                   "/"
+constexpr OUStringLiteral PATHDELIMITER = u"/";
 
-#define SETNODE_NEWMENU                                 "New"
-#define SETNODE_WIZARDMENU                              "Wizard"
+constexpr OUStringLiteral SETNODE_NEWMENU = u"New";
+constexpr OUStringLiteral SETNODE_WIZARDMENU = u"Wizard";
 
 #define PROPERTYNAME_URL                                DYNAMICMENU_PROPERTYNAME_URL
 #define PROPERTYNAME_TITLE                              DYNAMICMENU_PROPERTYNAME_TITLE
@@ -51,7 +51,7 @@ using namespace ::com::sun::star::beans;
 
 #define PROPERTYCOUNT                                   4
 
-#define PATHPREFIX_SETUP                                "m"
+constexpr OUStringLiteral PATHPREFIX_SETUP = u"m";
 
 namespace
 {
@@ -235,8 +235,8 @@ static Sequence< OUString > lcl_GetPropertyNames(
 
     // Sort and expand all three list to result list ...
     Sequence< OUString > lProperties;
-    lcl_SortAndExpandPropertyNames( lNewItems          , lProperties, u"" SETNODE_NEWMENU   );
-    lcl_SortAndExpandPropertyNames( lWizardItems       , lProperties, u"" SETNODE_WIZARDMENU );
+    lcl_SortAndExpandPropertyNames( lNewItems          , lProperties, SETNODE_NEWMENU   );
+    lcl_SortAndExpandPropertyNames( lWizardItems       , lProperties, SETNODE_WIZARDMENU );
 
     // Return result.
     return lProperties;
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index dbfb4c208e6e..bfb7959bc488 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -43,7 +43,7 @@
 
 using namespace com::sun::star;
 
-#define FILE_PROTOCOL       "file:///"
+constexpr OUStringLiteral FILE_PROTOCOL = u"file:///";
 
 namespace
 {
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index 118d43056da5..3e5443295c41 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -73,17 +73,17 @@
 
 #define PROPERTYCOUNT                       6
 
-#define FACTORYNAME_WRITER                  u"com.sun.star.text.TextDocument"
-#define FACTORYNAME_WRITERWEB               u"com.sun.star.text.WebDocument"
-#define FACTORYNAME_WRITERGLOBAL            u"com.sun.star.text.GlobalDocument"
-#define FACTORYNAME_CALC                    u"com.sun.star.sheet.SpreadsheetDocument"
-#define FACTORYNAME_DRAW                    u"com.sun.star.drawing.DrawingDocument"
-#define FACTORYNAME_IMPRESS                 u"com.sun.star.presentation.PresentationDocument"
-#define FACTORYNAME_MATH                    u"com.sun.star.formula.FormulaProperties"
-#define FACTORYNAME_CHART                   u"com.sun.star.chart2.ChartDocument"
-#define FACTORYNAME_DATABASE                u"com.sun.star.sdb.OfficeDatabaseDocument"
-#define FACTORYNAME_STARTMODULE             u"com.sun.star.frame.StartModule"
-#define FACTORYNAME_BASIC                   u"com.sun.star.script.BasicIDE"
+constexpr OUStringLiteral FACTORYNAME_WRITER = u"com.sun.star.text.TextDocument";
+constexpr OUStringLiteral FACTORYNAME_WRITERWEB = u"com.sun.star.text.WebDocument";
+constexpr OUStringLiteral FACTORYNAME_WRITERGLOBAL = u"com.sun.star.text.GlobalDocument";
+constexpr OUStringLiteral FACTORYNAME_CALC = u"com.sun.star.sheet.SpreadsheetDocument";
+constexpr OUStringLiteral FACTORYNAME_DRAW = u"com.sun.star.drawing.DrawingDocument";
+constexpr OUStringLiteral FACTORYNAME_IMPRESS = u"com.sun.star.presentation.PresentationDocument";
+constexpr OUStringLiteral FACTORYNAME_MATH = u"com.sun.star.formula.FormulaProperties";
+constexpr OUStringLiteral FACTORYNAME_CHART = u"com.sun.star.chart2.ChartDocument";
+constexpr OUStringLiteral FACTORYNAME_DATABASE = u"com.sun.star.sdb.OfficeDatabaseDocument";
+constexpr OUStringLiteral FACTORYNAME_STARTMODULE = u"com.sun.star.frame.StartModule";
+constexpr OUStringLiteral FACTORYNAME_BASIC = u"com.sun.star.script.BasicIDE";
 
 #define FACTORYCOUNT                        11
 
diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx
index 8414167e9af0..cec3642fa37a 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -36,10 +36,10 @@
 
 using namespace ::com::sun::star::uno;
 
-#define PROPERTYNAME_MACRO_TRUSTEDAUTHORS       u"TrustedAuthors"
-#define PROPERTYNAME_TRUSTEDAUTHOR_SUBJECTNAME  u"SubjectName"
-#define PROPERTYNAME_TRUSTEDAUTHOR_SERIALNUMBER u"SerialNumber"
-#define PROPERTYNAME_TRUSTEDAUTHOR_RAWDATA      u"RawData"
+constexpr OUStringLiteral PROPERTYNAME_MACRO_TRUSTEDAUTHORS = u"TrustedAuthors";
+constexpr OUStringLiteral PROPERTYNAME_TRUSTEDAUTHOR_SUBJECTNAME = u"SubjectName";
+constexpr OUStringLiteral PROPERTYNAME_TRUSTEDAUTHOR_SERIALNUMBER = u"SerialNumber";
+constexpr OUStringLiteral PROPERTYNAME_TRUSTEDAUTHOR_RAWDATA = u"RawData";
 
 
 namespace SvtSecurityOptions
@@ -247,7 +247,7 @@ void SetTrustedAuthors( const std::vector< Certificate >& rAuthors )
     for( sal_Int32 i = 0; i < nCnt; ++i )
     {
         OUString aPrefix(
-            PROPERTYNAME_MACRO_TRUSTEDAUTHORS "/a"
+            PROPERTYNAME_MACRO_TRUSTEDAUTHORS + "/a"
             + OUString::number(i) + "/");
         Sequence< css::beans::PropertyValue >    lPropertyValues( 3 );
         lPropertyValues[ 0 ].Name = aPrefix + PROPERTYNAME_TRUSTEDAUTHOR_SUBJECTNAME;
diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx
index 7cbb817ee1bf..9906124a141a 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -111,14 +111,14 @@ public:
             const LanguageTag&  GetRealUILocale() const { return m_aRealUILocale; }
 };
 
-#define ROOTNODE_SYSLOCALE              "Setup/L10N"
-
-#define PROPERTYNAME_LOCALE             "ooSetupSystemLocale"
-#define PROPERTYNAME_UILOCALE           "ooLocale"
-#define PROPERTYNAME_CURRENCY           "ooSetupCurrency"
-#define PROPERTYNAME_DECIMALSEPARATOR   "DecimalSeparatorAsLocale"
-#define PROPERTYNAME_DATEPATTERNS       "DateAcceptancePatterns"
-#define PROPERTYNAME_IGNORELANGCHANGE   "IgnoreLanguageChange"
+constexpr OUStringLiteral ROOTNODE_SYSLOCALE = u"Setup/L10N";
+
+constexpr OUStringLiteral PROPERTYNAME_LOCALE = u"ooSetupSystemLocale";
+constexpr OUStringLiteral PROPERTYNAME_UILOCALE = u"ooLocale";
+constexpr OUStringLiteral PROPERTYNAME_CURRENCY = u"ooSetupCurrency";
+constexpr OUStringLiteral PROPERTYNAME_DECIMALSEPARATOR = u"DecimalSeparatorAsLocale";
+constexpr OUStringLiteral PROPERTYNAME_DATEPATTERNS = u"DateAcceptancePatterns";
+constexpr OUStringLiteral PROPERTYNAME_IGNORELANGCHANGE = u"IgnoreLanguageChange";
 
 #define PROPERTYHANDLE_LOCALE           0
 #define PROPERTYHANDLE_UILOCALE         1