tdf#54857 use OUStringConstExpr in XMLPropertyMapEntry

which means we don't need to allocate a bunch of strings
when building the property maps in xmloff

Change-Id: I83cb013f816d9b7bcb0dd55c59e5151b33b91c9c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142192
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

3 files changed, 183 insertions, 178 deletions

diff --git a/dbaccess/inc/strings.hxx b/dbaccess/inc/strings.hxx
index eb90a6c04d82..021f34cc70b5 100644
--- a/dbaccess/inc/strings.hxx
+++ b/dbaccess/inc/strings.hxx
@@ -12,147 +12,152 @@
 
 // property names
 
-#define PROPERTY_URL "URL"
-#define PROPERTY_INFO "Info"
-#define PROPERTY_SETTINGS "Settings"
-#define PROPERTY_ISPASSWORDREQUIRED "IsPasswordRequired"
-#define PROPERTY_TABLEFILTER "TableFilter"
-#define PROPERTY_TABLETYPEFILTER "TableTypeFilter"
-#define PROPERTY_NAME "Name"
-#define PROPERTY_SCHEMANAME "SchemaName"
-#define PROPERTY_CATALOGNAME "CatalogName"
-#define PROPERTY_PRIVILEGES "Privileges"
-#define PROPERTY_ESCAPE_PROCESSING "EscapeProcessing"
-#define PROPERTY_COMMAND "Command"
-#define PROPERTY_TYPE "Type"
-#define PROPERTY_TYPENAME "TypeName"
-#define PROPERTY_PRECISION "Precision"
-#define PROPERTY_SCALE "Scale"
-#define PROPERTY_ISNULLABLE "IsNullable"
-#define PROPERTY_ISAUTOINCREMENT "IsAutoIncrement"
-#define PROPERTY_ISROWVERSION "IsRowVersion"
-#define PROPERTY_DESCRIPTION "Description"
-#define PROPERTY_DEFAULTVALUE "DefaultValue"
-#define PROPERTY_NUMBERFORMAT "FormatKey"
-#define PROPERTY_QUERYTIMEOUT "QueryTimeOut"
-#define PROPERTY_MAXFIELDSIZE "MaxFieldSize"
-#define PROPERTY_MAXROWS "MaxRows"
-#define PROPERTY_CURSORNAME "CursorName"
-#define PROPERTY_RESULTSETCONCURRENCY "ResultSetConcurrency"
-#define PROPERTY_RESULTSETTYPE "ResultSetType"
-#define PROPERTY_FETCHDIRECTION "FetchDirection"
-#define PROPERTY_FETCHSIZE "FetchSize"
-#define PROPERTY_USEBOOKMARKS "UseBookmarks"
-#define PROPERTY_ISSEARCHABLE "IsSearchable"
-#define PROPERTY_ISCURRENCY "IsCurrency"
-#define PROPERTY_ISSIGNED "IsSigned"
-#define PROPERTY_DISPLAYSIZE "DisplaySize"
-#define PROPERTY_LABEL "Label"
-#define PROPERTY_ISREADONLY "IsReadOnly"
-#define PROPERTY_ISWRITABLE "IsWritable"
-#define PROPERTY_ISDEFINITELYWRITABLE "IsDefinitelyWritable"
-#define PROPERTY_VALUE "Value"
-#define PROPERTY_TABLENAME "TableName"
-#define PROPERTY_ISCASESENSITIVE "IsCaseSensitive"
-#define PROPERTY_SERVICENAME "ServiceName"
-#define PROPERTY_ISBOOKMARKABLE "IsBookmarkable"
-#define PROPERTY_CANUPDATEINSERTEDROWS "CanUpdateInsertedRows"
-#define PROPERTY_NUMBERFORMATSSUPPLIER "NumberFormatsSupplier"
-#define PROPERTY_DATASOURCENAME "DataSourceName"
-#define PROPERTY_DATABASE_LOCATION "DatabaseLocation"
-#define PROPERTY_CONNECTION_RESOURCE "ConnectionResource"
-#define PROPERTY_CONNECTION_INFO "ConnectionInfo"
-#define PROPERTY_RESULT_SET "ResultSet"
-#define PROPERTY_SELECTION "Selection"
-#define PROPERTY_BOOKMARK_SELECTION "BookmarkSelection"
-#define PROPERTY_COLUMN_NAME "ColumnName"
-#define PROPERTY_COLUMN "Column"
-#define PROPERTY_DATASOURCE "DataSource"
-#define PROPERTY_TRANSACTIONISOLATION "TransactionIsolation"
-#define PROPERTY_TYPEMAP "TypeMap"
-#define PROPERTY_USER "User"
-#define PROPERTY_PASSWORD "Password"
-#define PROPERTY_COMMAND_TYPE "CommandType"
-#define PROPERTY_ACTIVECOMMAND "ActiveCommand"
-#define PROPERTY_ACTIVE_CONNECTION "ActiveConnection"
-#define PROPERTY_FILTER "Filter"
-#define PROPERTY_APPLYFILTER "ApplyFilter"
-#define PROPERTY_ORDER "Order"
-#define PROPERTY_APPLYORDER "ApplyOrder"
-#define PROPERTY_ISMODIFIED "IsModified"
-#define PROPERTY_ISNEW "IsNew"
-#define PROPERTY_ROWCOUNT "RowCount"
-#define PROPERTY_ISROWCOUNTFINAL "IsRowCountFinal"
-#define PROPERTY_WIDTH "Width"
-#define PROPERTY_ROW_HEIGHT "RowHeight"
-#define PROPERTY_AUTOGROW "AutoGrow"
-#define PROPERTY_FORMATKEY "FormatKey"
-#define PROPERTY_ALIGN "Align"
-#define PROPERTY_FONT "FontDescriptor"
-#define PROPERTY_TEXTCOLOR "TextColor"
-#define PROPERTY_BOUNDFIELD "BoundField"
-#define PROPERTY_CONTROLSOURCE "DataField"
-#define PROPERTY_REALNAME "RealName"
-#define PROPERTY_UPDATE_TABLENAME "UpdateTableName"
-#define PROPERTY_UPDATE_SCHEMANAME "UpdateSchemaName"
-#define PROPERTY_UPDATE_CATALOGNAME "UpdateCatalogName"
-#define PROPERTY_RELATIVEPOSITION "RelativePosition"
-#define PROPERTY_CONTROLMODEL "ControlModel"
-#define PROPERTY_RELATEDCOLUMN "RelatedColumn"
-#define PROPERTY_ISUNIQUE "IsUnique"
-#define PROPERTY_ISPRIMARYKEYINDEX "IsPrimaryKeyIndex"
-#define PROPERTY_IGNORERESULT "IgnoreResult"
-#define PROPERTY_UPDATERULE "UpdateRule"
-#define PROPERTY_DELETERULE "DeleteRule"
-#define PROPERTY_REFERENCEDTABLE "ReferencedTable"
-#define PROPERTY_SQLEXCEPTION "SQLException"
-#define PROPERTY_BORDER "Border"
-#define PROPERTY_HELPTEXT "HelpText"
-#define PROPERTY_CONTROLDEFAULT "ControlDefault"
-#define PROPERTY_HIDDEN "Hidden"
-#define PROPERTY_DEFAULTSTATE "DefaultState"
-#define PROPERTY_SUPPRESSVERSIONCL "SuppressVersionColumns"
-#define PROPERTY_SHOW_BROWSER "ShowBrowser"
-#define PROPERTY_ENABLE_BROWSER "EnableBrowser"
-#define PROPERTY_SHOWMENU "ShowMenu"
-#define PROPERTY_LAYOUTINFORMATION "LayoutInformation"
-#define PROPERTY_CURRENTTABLE "CurrentTable"
-#define PROPERTY_TEXTLINECOLOR "TextLineColor"
-#define PROPERTY_TEXTEMPHASIS "FontEmphasisMark"
-#define PROPERTY_TEXTRELIEF "FontRelief"
-#define PROPERTY_DEFAULTTEXT "DefaultText"
-#define PROPERTY_EFFECTIVEDEFAULT "EffectiveDefault"
-#define PROPERTY_AUTOINCREMENTCREATION "AutoIncrementCreation"
-#define PROPERTY_BOOLEANCOMPARISONMODE "BooleanComparisonMode"
-#define PROPERTY_ENABLESQL92CHECK "EnableSQL92Check"
-#define PROPERTY_FONTCHARWIDTH "FontCharWidth"
-#define PROPERTY_FONTCHARSET "FontCharset"
-#define PROPERTY_FONTFAMILY "FontFamily"
-#define PROPERTY_FONTHEIGHT "FontHeight"
-#define PROPERTY_FONTKERNING "FontKerning"
-#define PROPERTY_FONTNAME "FontName"
-#define PROPERTY_FONTORIENTATION "FontOrientation"
-#define PROPERTY_FONTPITCH "FontPitch"
-#define PROPERTY_FONTSLANT "FontSlant"
-#define PROPERTY_FONTSTRIKEOUT "FontStrikeout"
-#define PROPERTY_FONTSTYLENAME "FontStyleName"
-#define PROPERTY_FONTUNDERLINE "FontUnderline"
-#define PROPERTY_FONTWEIGHT "FontWeight"
-#define PROPERTY_FONTWIDTH "FontWidth"
-#define PROPERTY_FONTWORDLINEMODE "FontWordLineMode"
-#define PROPERTY_FONTTYPE "FontType"
-#define PROPERTY_PERSISTENT_NAME "PersistentName"
-#define PROPERTY_EMBEDDEDOBJECT "EmbeddedObject"
-#define PROPERTY_ORIGINAL "Original"
-#define PROPERTY_USECATALOGINSELECT "UseCatalogInSelect"
-#define PROPERTY_USESCHEMAINSELECT "UseSchemaInSelect"
-#define PROPERTY_OUTERJOINESCAPE "EnableOuterJoinEscape"
-#define PROPERTY_AS_TEMPLATE "AsTemplate"
-#define PROPERTY_HAVING_CLAUSE "HavingClause"
-#define PROPERTY_GROUP_BY "GroupBy"
-#define PROPERTY_EDIT_WIDTH "EditWidth"
-#define PROPERTY_SINGLESELECTQUERYCOMPOSER "SingleSelectQueryComposer"
-#define PROPERTY_CHANGE_NOTIFICATION_ENABLED "PropertyChangeNotificationEnabled"
+inline constexpr OUStringLiteral PROPERTY_URL(u"URL");
+inline constexpr OUStringLiteral PROPERTY_INFO(u"Info");
+inline constexpr OUStringLiteral PROPERTY_SETTINGS(u"Settings");
+inline constexpr OUStringLiteral PROPERTY_ISPASSWORDREQUIRED(u"IsPasswordRequired");
+inline constexpr OUStringLiteral PROPERTY_TABLEFILTER(u"TableFilter");
+inline constexpr OUStringLiteral PROPERTY_TABLETYPEFILTER(u"TableTypeFilter");
+inline constexpr OUStringLiteral PROPERTY_NAME(u"Name");
+inline constexpr OUStringLiteral PROPERTY_SCHEMANAME(u"SchemaName");
+inline constexpr OUStringLiteral PROPERTY_CATALOGNAME(u"CatalogName");
+inline constexpr OUStringLiteral PROPERTY_PRIVILEGES(u"Privileges");
+inline constexpr OUStringLiteral PROPERTY_ESCAPE_PROCESSING(u"EscapeProcessing");
+inline constexpr OUStringLiteral PROPERTY_COMMAND(u"Command");
+inline constexpr OUStringLiteral PROPERTY_TYPE(u"Type");
+inline constexpr OUStringLiteral PROPERTY_TYPENAME(u"TypeName");
+inline constexpr OUStringLiteral PROPERTY_PRECISION(u"Precision");
+inline constexpr OUStringLiteral PROPERTY_SCALE(u"Scale");
+inline constexpr OUStringLiteral PROPERTY_ISNULLABLE(u"IsNullable");
+inline constexpr OUStringLiteral PROPERTY_ISAUTOINCREMENT(u"IsAutoIncrement");
+inline constexpr OUStringLiteral PROPERTY_ISROWVERSION(u"IsRowVersion");
+inline constexpr OUStringLiteral PROPERTY_DESCRIPTION(u"Description");
+inline constexpr OUStringLiteral PROPERTY_DEFAULTVALUE(u"DefaultValue");
+inline constexpr OUStringLiteral PROPERTY_NUMBERFORMAT(u"FormatKey");
+inline constexpr OUStringLiteral PROPERTY_QUERYTIMEOUT(u"QueryTimeOut");
+inline constexpr OUStringLiteral PROPERTY_MAXFIELDSIZE(u"MaxFieldSize");
+inline constexpr OUStringLiteral PROPERTY_MAXROWS(u"MaxRows");
+inline constexpr OUStringLiteral PROPERTY_CURSORNAME(u"CursorName");
+inline constexpr OUStringLiteral PROPERTY_RESULTSETCONCURRENCY(u"ResultSetConcurrency");
+inline constexpr OUStringLiteral PROPERTY_RESULTSETTYPE(u"ResultSetType");
+inline constexpr OUStringLiteral PROPERTY_FETCHDIRECTION(u"FetchDirection");
+inline constexpr OUStringLiteral PROPERTY_FETCHSIZE(u"FetchSize");
+inline constexpr OUStringLiteral PROPERTY_USEBOOKMARKS(u"UseBookmarks");
+inline constexpr OUStringLiteral PROPERTY_ISSEARCHABLE(u"IsSearchable");
+inline constexpr OUStringLiteral PROPERTY_ISCURRENCY(u"IsCurrency");
+inline constexpr OUStringLiteral PROPERTY_ISSIGNED(u"IsSigned");
+inline constexpr OUStringLiteral PROPERTY_DISPLAYSIZE(u"DisplaySize");
+inline constexpr OUStringLiteral PROPERTY_LABEL(u"Label");
+inline constexpr OUStringLiteral PROPERTY_ISREADONLY(u"IsReadOnly");
+inline constexpr OUStringLiteral PROPERTY_ISWRITABLE(u"IsWritable");
+inline constexpr OUStringLiteral PROPERTY_ISDEFINITELYWRITABLE(u"IsDefinitelyWritable");
+inline constexpr OUStringLiteral PROPERTY_VALUE(u"Value");
+inline constexpr OUStringLiteral PROPERTY_TABLENAME(u"TableName");
+inline constexpr OUStringLiteral PROPERTY_ISCASESENSITIVE(u"IsCaseSensitive");
+inline constexpr OUStringLiteral PROPERTY_SERVICENAME(u"ServiceName");
+inline constexpr OUStringLiteral PROPERTY_ISBOOKMARKABLE(u"IsBookmarkable");
+inline constexpr OUStringLiteral PROPERTY_CANUPDATEINSERTEDROWS(u"CanUpdateInsertedRows");
+inline constexpr OUStringLiteral PROPERTY_NUMBERFORMATSSUPPLIER(u"NumberFormatsSupplier");
+inline constexpr OUStringLiteral PROPERTY_DATASOURCENAME(u"DataSourceName");
+inline constexpr OUStringLiteral PROPERTY_DATABASE_LOCATION(u"DatabaseLocation");
+inline constexpr OUStringLiteral PROPERTY_CONNECTION_RESOURCE(u"ConnectionResource");
+inline constexpr OUStringLiteral PROPERTY_CONNECTION_INFO(u"ConnectionInfo");
+inline constexpr OUStringLiteral PROPERTY_RESULT_SET(u"ResultSet");
+inline constexpr OUStringLiteral PROPERTY_SELECTION(u"Selection");
+inline constexpr OUStringLiteral PROPERTY_BOOKMARK_SELECTION(u"BookmarkSelection");
+inline constexpr OUStringLiteral PROPERTY_COLUMN_NAME(u"ColumnName");
+inline constexpr OUStringLiteral PROPERTY_COLUMN(u"Column");
+inline constexpr OUStringLiteral PROPERTY_DATASOURCE(u"DataSource");
+inline constexpr OUStringLiteral PROPERTY_TRANSACTIONISOLATION(u"TransactionIsolation");
+inline constexpr OUStringLiteral PROPERTY_TYPEMAP(u"TypeMap");
+inline constexpr OUStringLiteral PROPERTY_USER(u"User");
+inline constexpr OUStringLiteral PROPERTY_PASSWORD(u"Password");
+inline constexpr OUStringLiteral PROPERTY_COMMAND_TYPE(u"CommandType");
+inline constexpr OUStringLiteral PROPERTY_ACTIVECOMMAND(u"ActiveCommand");
+inline constexpr OUStringLiteral PROPERTY_ACTIVE_CONNECTION(u"ActiveConnection");
+inline constexpr OUStringLiteral PROPERTY_FILTER(u"Filter");
+inline constexpr OUStringLiteral PROPERTY_APPLYFILTER(u"ApplyFilter");
+inline constexpr OUStringLiteral PROPERTY_ORDER(u"Order");
+inline constexpr OUStringLiteral PROPERTY_APPLYORDER(u"ApplyOrder");
+inline constexpr OUStringLiteral PROPERTY_ISMODIFIED(u"IsModified");
+inline constexpr OUStringLiteral PROPERTY_ISNEW(u"IsNew");
+inline constexpr OUStringLiteral PROPERTY_ROWCOUNT(u"RowCount");
+inline constexpr OUStringLiteral PROPERTY_ISROWCOUNTFINAL(u"IsRowCountFinal");
+inline constexpr OUStringLiteral PROPERTY_WIDTH(u"Width");
+inline constexpr OUStringLiteral PROPERTY_ROW_HEIGHT(u"RowHeight");
+inline constexpr OUStringLiteral PROPERTY_AUTOGROW(u"AutoGrow");
+inline constexpr OUStringLiteral PROPERTY_FORMATKEY(u"FormatKey");
+inline constexpr OUStringLiteral PROPERTY_ALIGN(u"Align");
+inline constexpr OUStringLiteral PROPERTY_FONT(u"FontDescriptor");
+inline constexpr OUStringLiteral PROPERTY_TEXTCOLOR(u"TextColor");
+inline constexpr OUStringLiteral PROPERTY_BOUNDFIELD(u"BoundField");
+inline constexpr OUStringLiteral PROPERTY_CONTROLSOURCE(u"DataField");
+inline constexpr OUStringLiteral PROPERTY_REALNAME(u"RealName");
+inline constexpr OUStringLiteral PROPERTY_UPDATE_TABLENAME(u"UpdateTableName");
+inline constexpr OUStringLiteral PROPERTY_UPDATE_SCHEMANAME(u"UpdateSchemaName");
+inline constexpr OUStringLiteral PROPERTY_UPDATE_CATALOGNAME(u"UpdateCatalogName");
+inline constexpr OUStringLiteral PROPERTY_RELATIVEPOSITION(u"RelativePosition");
+inline constexpr OUStringLiteral PROPERTY_CONTROLMODEL(u"ControlModel");
+inline constexpr OUStringLiteral PROPERTY_RELATEDCOLUMN(u"RelatedColumn");
+inline constexpr OUStringLiteral PROPERTY_ISUNIQUE(u"IsUnique");
+inline constexpr OUStringLiteral PROPERTY_ISPRIMARYKEYINDEX(u"IsPrimaryKeyIndex");
+inline constexpr OUStringLiteral PROPERTY_IGNORERESULT(u"IgnoreResult");
+inline constexpr OUStringLiteral PROPERTY_UPDATERULE(u"UpdateRule");
+inline constexpr OUStringLiteral PROPERTY_DELETERULE(u"DeleteRule");
+inline constexpr OUStringLiteral PROPERTY_REFERENCEDTABLE(u"ReferencedTable");
+inline constexpr OUStringLiteral PROPERTY_SQLEXCEPTION(u"SQLException");
+inline constexpr OUStringLiteral PROPERTY_BORDER(u"Border");
+inline constexpr OUStringLiteral PROPERTY_HELPTEXT(u"HelpText");
+inline constexpr OUStringLiteral PROPERTY_CONTROLDEFAULT(u"ControlDefault");
+inline constexpr OUStringLiteral PROPERTY_HIDDEN(u"Hidden");
+inline constexpr OUStringLiteral PROPERTY_DEFAULTSTATE(u"DefaultState");
+inline constexpr OUStringLiteral PROPERTY_SUPPRESSVERSIONCL(u"SuppressVersionColumns");
+inline constexpr OUStringLiteral PROPERTY_SHOW_BROWSER(u"ShowBrowser");
+inline constexpr OUStringLiteral PROPERTY_ENABLE_BROWSER(u"EnableBrowser");
+inline constexpr OUStringLiteral PROPERTY_SHOWMENU(u"ShowMenu");
+inline constexpr OUStringLiteral PROPERTY_LAYOUTINFORMATION(u"LayoutInformation");
+inline constexpr OUStringLiteral PROPERTY_CURRENTTABLE(u"CurrentTable");
+inline constexpr OUStringLiteral PROPERTY_TEXTLINECOLOR(u"TextLineColor");
+inline constexpr OUStringLiteral PROPERTY_TEXTEMPHASIS(u"FontEmphasisMark");
+inline constexpr OUStringLiteral PROPERTY_TEXTRELIEF(u"FontRelief");
+inline constexpr OUStringLiteral PROPERTY_DEFAULTTEXT(u"DefaultText");
+inline constexpr OUStringLiteral PROPERTY_EFFECTIVEDEFAULT(u"EffectiveDefault");
+inline constexpr OUStringLiteral PROPERTY_AUTOINCREMENTCREATION(u"AutoIncrementCreation");
+inline constexpr OUStringLiteral PROPERTY_BOOLEANCOMPARISONMODE(u"BooleanComparisonMode");
+inline constexpr OUStringLiteral PROPERTY_ENABLESQL92CHECK(u"EnableSQL92Check");
+inline constexpr OUStringLiteral PROPERTY_FONTCHARWIDTH(u"FontCharWidth");
+inline constexpr OUStringLiteral PROPERTY_FONTCHARSET(u"FontCharset");
+inline constexpr OUStringLiteral PROPERTY_FONTFAMILY(u"FontFamily");
+inline constexpr OUStringLiteral PROPERTY_FONTHEIGHT(u"FontHeight");
+inline constexpr OUStringLiteral PROPERTY_FONTKERNING(u"FontKerning");
+inline constexpr OUStringLiteral PROPERTY_FONTNAME(u"FontName");
+inline constexpr OUStringLiteral PROPERTY_FONTORIENTATION(u"FontOrientation");
+inline constexpr OUStringLiteral PROPERTY_FONTPITCH(u"FontPitch");
+inline constexpr OUStringLiteral PROPERTY_FONTSLANT(u"FontSlant");
+inline constexpr OUStringLiteral PROPERTY_FONTSTRIKEOUT(u"FontStrikeout");
+inline constexpr OUStringLiteral PROPERTY_FONTSTYLENAME(u"FontStyleName");
+inline constexpr OUStringLiteral PROPERTY_FONTUNDERLINE(u"FontUnderline");
+inline constexpr OUStringLiteral PROPERTY_FONTWEIGHT(u"FontWeight");
+inline constexpr OUStringLiteral PROPERTY_FONTWIDTH(u"FontWidth");
+inline constexpr OUStringLiteral PROPERTY_FONTWORDLINEMODE(u"FontWordLineMode");
+inline constexpr OUStringLiteral PROPERTY_FONTTYPE(u"FontType");
+inline constexpr OUStringLiteral PROPERTY_PERSISTENT_NAME(u"PersistentName");
+inline constexpr OUStringLiteral PROPERTY_EMBEDDEDOBJECT(u"EmbeddedObject");
+inline constexpr OUStringLiteral PROPERTY_ORIGINAL(u"Original");
+inline constexpr OUStringLiteral PROPERTY_USECATALOGINSELECT(u"UseCatalogInSelect");
+inline constexpr OUStringLiteral PROPERTY_USESCHEMAINSELECT(u"UseSchemaInSelect");
+inline constexpr OUStringLiteral PROPERTY_OUTERJOINESCAPE(u"EnableOuterJoinEscape");
+inline constexpr OUStringLiteral PROPERTY_AS_TEMPLATE(u"AsTemplate");
+inline constexpr OUStringLiteral PROPERTY_HAVING_CLAUSE(u"HavingClause");
+inline constexpr OUStringLiteral PROPERTY_GROUP_BY(u"GroupBy");
+inline constexpr OUStringLiteral PROPERTY_EDIT_WIDTH(u"EditWidth");
+inline constexpr OUStringLiteral PROPERTY_SINGLESELECTQUERYCOMPOSER(u"SingleSelectQueryComposer");
+inline constexpr OUStringLiteral
+    PROPERTY_CHANGE_NOTIFICATION_ENABLED(u"PropertyChangeNotificationEnabled");
+inline constexpr OUStringLiteral PROPERTY_CHAR_STRIKEOUT(u"CharStrikeout");
+inline constexpr OUStringLiteral PROPERTY_CHAR_UNDERLINE(u"CharUnderline");
+inline constexpr OUStringLiteral PROPERTY_CHAR_UNDERLINE_COLOR(u"CharUnderlineColor");
+inline constexpr OUStringLiteral PROPERTY_CHAR_UNDERLINE_HAS_COLOR(u"CharUnderlineHasColor");
 
 // service names
 
@@ -236,7 +241,7 @@ inline constexpr OUStringLiteral URL_COMPONENT_FORMGRIDVIEW = u".component:DB/Fo
 inline constexpr OUStringLiteral URL_COMPONENT_DATASOURCEBROWSER
     = u".component:DB/DataSourceBrowser";
 inline constexpr OUStringLiteral URL_COMPONENT_RELATIONDESIGN = u".component:DB/RelationDesign";
-#define URL_COMPONENT_REPORTDESIGN ".component:DB/ReportDesign"
+inline constexpr OUStringLiteral URL_COMPONENT_REPORTDESIGN(u".component:DB/ReportDesign");
 
 // service names
 
@@ -245,24 +250,24 @@ inline constexpr OUStringLiteral SERVICE_SDB_DIRECTSQLDIALOG
 
 // other DBU relevant strings
 
-#define PROPERTY_QUERYDESIGNVIEW "QueryDesignView"
-#define PROPERTY_GRAPHICAL_DESIGN "GraphicalDesign"
-#define PROPERTY_HELP_URL "HelpURL"
+inline constexpr OUStringLiteral PROPERTY_QUERYDESIGNVIEW(u"QueryDesignView");
+inline constexpr OUStringLiteral PROPERTY_GRAPHICAL_DESIGN(u"GraphicalDesign");
+inline constexpr OUStringLiteral PROPERTY_HELP_URL(u"HelpURL");
 inline constexpr OUStringLiteral FRAME_NAME_QUERY_PREVIEW = u"QueryPreview";
 inline constexpr OUStringLiteral SERVICE_CONTROLDEFAULT = u"com.sun.star.comp.dbu.OColumnControl";
 
 // other DBU properties
 
-#define PROPERTY_ENABLEOUTERJOIN "EnableOuterJoinEscape"
-#define PROPERTY_TABSTOP "TabStop"
-#define PROPERTY_DEFAULTCONTROL "DefaultControl"
-#define PROPERTY_ENABLED "Enabled"
-#define PROPERTY_MOUSE_WHEEL_BEHAVIOR "MouseWheelBehavior"
+inline constexpr OUStringLiteral PROPERTY_ENABLEOUTERJOIN(u"EnableOuterJoinEscape");
+inline constexpr OUStringLiteral PROPERTY_TABSTOP(u"TabStop");
+inline constexpr OUStringLiteral PROPERTY_DEFAULTCONTROL(u"DefaultControl");
+inline constexpr OUStringLiteral PROPERTY_ENABLED(u"Enabled");
+inline constexpr OUStringLiteral PROPERTY_MOUSE_WHEEL_BEHAVIOR(u"MouseWheelBehavior");
 
 inline constexpr OUStringLiteral SQLSTATE_GENERAL = u"01000";
 
-#define PROPERTY_IS_FORM "IsForm"
-#define PROPERTY_PERSISTENT_PATH "PersistentPath"
+inline constexpr OUStringLiteral PROPERTY_IS_FORM(u"IsForm");
+inline constexpr OUStringLiteral PROPERTY_PERSISTENT_PATH(u"PersistentPath");
 
 inline constexpr OUStringLiteral STR_AUTOTEXTSEPARATORLIST = u"\"\t34\t'\t39";
 
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx
index e2cedbddf92e..a385079fcae7 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -170,35 +170,35 @@ OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, co
 
 
     if( ! (_rxParserColumn->getPropertyValue( PROPERTY_TYPENAME ) >>= m_aTypeName) )
-        SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property " PROPERTY_TYPENAME);
+        SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property " + PROPERTY_TYPENAME);
 
     if( ! (_rxParserColumn->getPropertyValue( PROPERTY_ISNULLABLE ) >>= m_nIsNullable) )
-        SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property " PROPERTY_ISNULLABLE);
+        SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property " + PROPERTY_ISNULLABLE);
 
     if( ! (_rxParserColumn->getPropertyValue( PROPERTY_PRECISION ) >>= m_nPrecision) )
-        SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property " PROPERTY_PRECISION);
+        SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property " + PROPERTY_PRECISION);
 
     if( ! (_rxParserColumn->getPropertyValue( PROPERTY_SCALE ) >>= m_nScale) )
-        SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property " PROPERTY_SCALE);
+        SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property " + PROPERTY_SCALE);
 
     if( ! (_rxParserColumn->getPropertyValue( PROPERTY_TYPE ) >>= m_nType) )
-        SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property " PROPERTY_TYPE);
+        SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property " + PROPERTY_TYPE);
 
     if( ! (_rxParserColumn->getPropertyValue( PROPERTY_ISAUTOINCREMENT ) >>= m_bAutoIncrement) )
-        SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property " PROPERTY_ISAUTOINCREMENT);
+        SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property " + PROPERTY_ISAUTOINCREMENT);
 
     if( ! (_rxParserColumn->getPropertyValue( PROPERTY_ISCURRENCY ) >>= m_bCurrency) )
-        SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property " PROPERTY_ISCURRENCY);
+        SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property " + PROPERTY_ISCURRENCY);
 
     if( ! (_rxParserColumn->getPropertyValue( PROPERTY_NAME ) >>= m_sName) )
-        SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property " PROPERTY_NAME);
+        SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property " + PROPERTY_NAME);
 
     m_bRowVersion = false;
 
     Reference< XPropertySetInfo > xPSI( _rxParserColumn->getPropertySetInfo(), UNO_SET_THROW );
     if ( xPSI->hasPropertyByName( PROPERTY_DEFAULTVALUE ) )
         if( ! (_rxParserColumn->getPropertyValue( PROPERTY_DEFAULTVALUE ) >>= m_aDefaultValue) )
-            SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property " PROPERTY_DEFAULTVALUE);
+            SAL_WARN("dbaccess.core", "OQueryColumn: unable to get property " + PROPERTY_DEFAULTVALUE);
 
     // copy some optional properties from the parser column
     struct PropertyDescriptor
@@ -244,11 +244,11 @@ Reference< XPropertySet > OQueryColumn::impl_determineOriginalTableColumn( const
         // respective properties
         OUString sCatalog, sSchema, sTable;
         if( ! (getPropertyValue( PROPERTY_CATALOGNAME ) >>= sCatalog) )
-            SAL_WARN("dbaccess.core", "impl_determineOriginalTableColumn: unable to get property " PROPERTY_CATALOGNAME);
+            SAL_WARN("dbaccess.core", "impl_determineOriginalTableColumn: unable to get property " + PROPERTY_CATALOGNAME);
         if( ! (getPropertyValue( PROPERTY_SCHEMANAME ) >>= sSchema) )
-            SAL_WARN("dbaccess.core", "impl_determineOriginalTableColumn: unable to get property " PROPERTY_SCHEMANAME);
+            SAL_WARN("dbaccess.core", "impl_determineOriginalTableColumn: unable to get property " + PROPERTY_SCHEMANAME);
         if( ! (getPropertyValue( PROPERTY_TABLENAME ) >>= sTable) )
-            SAL_WARN("dbaccess.core", "impl_determineOriginalTableColumn: unable to get property " PROPERTY_TABLENAME);
+            SAL_WARN("dbaccess.core", "impl_determineOriginalTableColumn: unable to get property " + PROPERTY_TABLENAME);
         if ( sCatalog.isEmpty() && sSchema.isEmpty() && sTable.isEmpty() )
             return nullptr;
 
@@ -266,7 +266,7 @@ Reference< XPropertySet > OQueryColumn::impl_determineOriginalTableColumn( const
 
         OUString sColumn;
         if( ! (getPropertyValue( PROPERTY_REALNAME ) >>= sColumn) )
-            SAL_WARN("dbaccess.core", "impl_determineOriginalTableColumn: unable to get property " PROPERTY_REALNAME);
+            SAL_WARN("dbaccess.core", "impl_determineOriginalTableColumn: unable to get property " + PROPERTY_REALNAME);
         if ( !xColumns->hasByName( sColumn ) )
             return nullptr;
 
diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx
index 85b98ec1eb70..546c67abf5f7 100644
--- a/dbaccess/source/filter/xml/xmlHelper.cxx
+++ b/dbaccess/source/filter/xml/xmlHelper.cxx
@@ -72,7 +72,7 @@ rtl::Reference < XMLPropertySetMapper > OXMLHelper::GetTableStylesPropertySetMap
 {
     static const XMLPropertyMapEntry s_aTableStylesProperties[] =
     {
-        { nullptr, 0, XML_TOKEN_INVALID, 0 , 0, SvtSaveOptions::ODFSVER_010, false}
+        { nullptr }
     };
     rtl::Reference < XMLPropertyHandlerFactory> xFac = new ::xmloff::OControlPropertyHandlerFactory();
     return new XMLPropertySetMapper(s_aTableStylesProperties, xFac, bForExport);
@@ -87,7 +87,7 @@ rtl::Reference < XMLPropertySetMapper > OXMLHelper::GetColumnStylesPropertySetMa
           CTF_DB_ISVISIBLE, SvtSaveOptions::ODFSVER_010, false },
         { PROPERTY_NUMBERFORMAT, XML_NAMESPACE_STYLE, XML_DATA_STYLE_NAME, XML_TYPE_NUMBER|MID_FLAG_SPECIAL_ITEM|XML_TYPE_PROP_TABLE_COLUMN,
            CTF_DB_NUMBERFORMAT, SvtSaveOptions::ODFSVER_010, false },
-        { nullptr, 0, XML_TOKEN_INVALID, 0 , 0, SvtSaveOptions::ODFSVER_010, false}
+        { nullptr }
     };
     rtl::Reference < XMLPropertyHandlerFactory> xFac = new OPropertyHandlerFactory();
     return new XMLPropertySetMapper(s_aColumnStylesProperties, xFac, bForExport);
@@ -113,29 +113,29 @@ rtl::Reference < XMLPropertySetMapper > OXMLHelper::GetCellStylesPropertySetMapp
         { PROPERTY_FONTORIENTATION, XML_NAMESPACE_STYLE, XML_ROTATION_ANGLE, XML_TYPE_ROTATION_ANGLE|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010, false },
         { PROPERTY_FONTPITCH, XML_NAMESPACE_STYLE, XML_FONT_PITCH, XML_TYPE_TEXT_FONTPITCH|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010, false },
         { PROPERTY_FONTSLANT, XML_NAMESPACE_FO, XML_FONT_STYLE, XML_TYPE_TEXT_POSTURE|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010, false },
-        { "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_STYLE,
+        { PROPERTY_CHAR_STRIKEOUT, XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_STYLE,
            XML_TYPE_TEXT_CROSSEDOUT_STYLE|MID_FLAG_MERGE_PROPERTY|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFSVER_010, false },
-        { "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TYPE,
+        { PROPERTY_CHAR_STRIKEOUT, XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TYPE,
           XML_TYPE_TEXT_CROSSEDOUT_TYPE|MID_FLAG_MERGE_PROPERTY|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFSVER_010, false },
-        { "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_WIDTH,
+        { PROPERTY_CHAR_STRIKEOUT, XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_WIDTH,
           XML_TYPE_TEXT_CROSSEDOUT_WIDTH|MID_FLAG_MERGE_PROPERTY|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFSVER_010, false },
-        { "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TEXT,
+        { PROPERTY_CHAR_STRIKEOUT, XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TEXT,
           XML_TYPE_TEXT_CROSSEDOUT_TEXT|MID_FLAG_MERGE_PROPERTY|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFSVER_010, false },
         { PROPERTY_FONTSTYLENAME, XML_NAMESPACE_STYLE, XML_FONT_STYLE_NAME, XML_TYPE_STRING|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010, false },
-        { "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_STYLE,
+        { PROPERTY_CHAR_UNDERLINE, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_STYLE,
            XML_TYPE_TEXT_UNDERLINE_STYLE|MID_FLAG_MERGE_PROPERTY|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010, false },
-        { "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_TYPE,
+        { PROPERTY_CHAR_UNDERLINE, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_TYPE,
            XML_TYPE_TEXT_UNDERLINE_TYPE|MID_FLAG_MERGE_PROPERTY|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010, false },
-        { "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_WIDTH,
+        { PROPERTY_CHAR_UNDERLINE, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_WIDTH,
            XML_TYPE_TEXT_UNDERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010, false },
-        { "CharUnderlineColor", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR,
+        { PROPERTY_CHAR_UNDERLINE_COLOR, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR,
           XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY|XML_TYPE_PROP_TEXT, 0    , SvtSaveOptions::ODFSVER_010, false },
-        { "CharUnderlineHasColor", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE|XML_TYPE_PROP_TEXT, 0    , SvtSaveOptions::ODFSVER_010, false },
+        { PROPERTY_CHAR_UNDERLINE_HAS_COLOR, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE|XML_TYPE_PROP_TEXT, 0    , SvtSaveOptions::ODFSVER_010, false },
         { PROPERTY_FONTWEIGHT, XML_NAMESPACE_FO, XML_FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010, false },
         { PROPERTY_FONTWIDTH, XML_NAMESPACE_STYLE, XML_FONT_WIDTH, XML_TYPE_FONT_WIDTH|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010, false },
         { PROPERTY_FONTWORDLINEMODE, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_MODE,
           XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010, false },
-        { nullptr, 0, XML_TOKEN_INVALID, 0 , 0, SvtSaveOptions::ODFSVER_010, false}
+        { nullptr }
     };
     rtl::Reference < XMLPropertyHandlerFactory> xFac = new /*OPropertyHandlerFactory*/::xmloff::OControlPropertyHandlerFactory();
     return new XMLPropertySetMapper(s_aCellStylesProperties, xFac, bForExport);
@@ -146,7 +146,7 @@ rtl::Reference < XMLPropertySetMapper > OXMLHelper::GetRowStylesPropertySetMappe
     static const XMLPropertyMapEntry s_aStylesProperties[] =
     {
         { PROPERTY_ROW_HEIGHT, XML_NAMESPACE_STYLE, XML_ROW_HEIGHT, XML_TYPE_MEASURE|XML_TYPE_PROP_TABLE_ROW, 0, SvtSaveOptions::ODFSVER_010, false },
-        { nullptr, 0, XML_TOKEN_INVALID, 0 , 0, SvtSaveOptions::ODFSVER_010, false}
+        { nullptr }
     };
     rtl::Reference < XMLPropertyHandlerFactory> xFac = new OPropertyHandlerFactory();
     return new XMLPropertySetMapper(s_aStylesProperties, xFac, true/*bForExport*/);