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, 43 insertions, 43 deletions

diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx
index 19b84f44e822..426965893abb 100644
--- a/reportdesign/source/filter/xml/xmlHelper.cxx
+++ b/reportdesign/source/filter/xml/xmlHelper.cxx
@@ -101,7 +101,7 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32
 #define MAP_CONST_P_ASCII( name, prefix, token, type, context ) { name, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_PARAGRAPH,  context, SvtSaveOptions::ODFSVER_010, false }
 #define MAP_CONST_S( name, prefix, token, type, context )  { name, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_SECTION,    context, SvtSaveOptions::ODFSVER_010, false }
 #define MAP_CONST_C_ASCII( name, prefix, token, type, context ) { name, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE_CELL, context, SvtSaveOptions::ODFSVER_010, false }
-#define MAP_END() { nullptr, 0, XML_TOKEN_INVALID, 0 ,0, SvtSaveOptions::ODFSVER_010, false}
+#define MAP_END() { nullptr }
 
 rtl::Reference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap(bool _bOldFormat, bool bForExport)
 {
@@ -120,10 +120,10 @@ rtl::Reference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap(bool
                                                 FO,   BACKGROUND_COLOR,     XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ),
             MAP_CONST_P_ASCII(      PROPERTY_CONTROLBACKGROUNDTRANSPARENT,
                                                 FO,   BACKGROUND_COLOR,     XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ),
-            MAP_CONST_C_ASCII(      "BorderLeft",       FO,     BORDER_LEFT,           XML_TYPE_BORDER, 0 ),
-            MAP_CONST_C_ASCII(      "BorderRight",      FO,     BORDER_RIGHT,          XML_TYPE_BORDER, 0 ),
-            MAP_CONST_C_ASCII(      "BorderTop",        FO,     BORDER_TOP,            XML_TYPE_BORDER, 0 ),
-            MAP_CONST_C_ASCII(      "BorderBottom",     FO,     BORDER_BOTTOM,         XML_TYPE_BORDER, 0 ),
+            MAP_CONST_C_ASCII(      PROPERTY_BORDERLEFT,       FO,     BORDER_LEFT,           XML_TYPE_BORDER, 0 ),
+            MAP_CONST_C_ASCII(      PROPERTY_BORDERRIGHT,      FO,     BORDER_RIGHT,          XML_TYPE_BORDER, 0 ),
+            MAP_CONST_C_ASCII(      PROPERTY_BORDERTOP,        FO,     BORDER_TOP,            XML_TYPE_BORDER, 0 ),
+            MAP_CONST_C_ASCII(      PROPERTY_BORDERBOTTOM,     FO,     BORDER_BOTTOM,         XML_TYPE_BORDER, 0 ),
             MAP_END()
         };
         return new XMLPropertySetMapper(s_aXMLCellStylesProperties,new OPropertyHandlerFactory(), bForExport);
@@ -140,10 +140,10 @@ rtl::Reference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap(bool
                                                 FO,   BACKGROUND_COLOR,     XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ),
             MAP_CONST_C_ASCII(      PROPERTY_VERTICALALIGN,
                                                 STYLE,    VERTICAL_ALIGN,       XML_RPT_ALIGNMENT, 0 ),
-            MAP_CONST_C_ASCII(      "BorderLeft",       FO,     BORDER_LEFT,           XML_TYPE_BORDER, 0 ),
-            MAP_CONST_C_ASCII(      "BorderRight",      FO,     BORDER_RIGHT,          XML_TYPE_BORDER, 0 ),
-            MAP_CONST_C_ASCII(      "BorderTop",        FO,     BORDER_TOP,            XML_TYPE_BORDER, 0 ),
-            MAP_CONST_C_ASCII(      "BorderBottom",     FO,     BORDER_BOTTOM,         XML_TYPE_BORDER, 0 ),
+            MAP_CONST_C_ASCII(      PROPERTY_BORDERLEFT,       FO,     BORDER_LEFT,           XML_TYPE_BORDER, 0 ),
+            MAP_CONST_C_ASCII(      PROPERTY_BORDERRIGHT,      FO,     BORDER_RIGHT,          XML_TYPE_BORDER, 0 ),
+            MAP_CONST_C_ASCII(      PROPERTY_BORDERTOP,        FO,     BORDER_TOP,            XML_TYPE_BORDER, 0 ),
+            MAP_CONST_C_ASCII(      PROPERTY_BORDERBOTTOM,     FO,     BORDER_BOTTOM,         XML_TYPE_BORDER, 0 ),
             MAP_END()
         };
         return new XMLPropertySetMapper(s_aXMLCellStylesProperties,new OPropertyHandlerFactory(), bForExport);
@@ -165,8 +165,8 @@ const XMLPropertyMapEntry* OXMLHelper::GetRowStyleProps()
 {
     static const XMLPropertyMapEntry aXMLStylesProperties[] =
     {
-        MAP_CONST_S("Height", STYLE, ROW_HEIGHT, XML_TYPE_PROP_TABLE_ROW | XML_TYPE_MEASURE, 0),
-        MAP_CONST_S("MinHeight", STYLE, MIN_ROW_HEIGHT, XML_TYPE_PROP_TABLE_ROW | XML_TYPE_MEASURE, 0),
+        MAP_CONST_S(PROPERTY_HEIGHT, STYLE, ROW_HEIGHT, XML_TYPE_PROP_TABLE_ROW | XML_TYPE_MEASURE, 0),
+        MAP_CONST_S(PROPERTY_MINHEIGHT, STYLE, MIN_ROW_HEIGHT, XML_TYPE_PROP_TABLE_ROW | XML_TYPE_MEASURE, 0),
         MAP_END()
     };
     return aXMLStylesProperties;
@@ -176,7 +176,7 @@ const XMLPropertyMapEntry* OXMLHelper::GetColumnStyleProps()
 {
     static const XMLPropertyMapEntry aXMLColumnStylesProperties[] =
     {
-        MAP_CONST_S(    "Width",                 STYLE,     COLUMN_WIDTH,           XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_MEASURE, 0 ),
+        MAP_CONST_S(    PROPERTY_WIDTH,                 STYLE,     COLUMN_WIDTH,           XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_MEASURE, 0 ),
         MAP_END()
     };
     return aXMLColumnStylesProperties;
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index 07f512bd5ac0..763f0e5077f9 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -348,12 +348,12 @@ uno::Sequence< beans::Property > SAL_CALL DataProviderHandler::getSupportedPrope
     {
         rptui::OPropertyInfoService::getExcludeProperties( aNewProps, m_xFormComponentHandler );
         beans::Property aValue;
-        static const std::u16string_view s_pProperties[] =
+        static const rtl::OUStringConstExpr s_pProperties[] =
         {
-             u"" PROPERTY_CHARTTYPE
-            ,u"" PROPERTY_MASTERFIELDS
-            ,u"" PROPERTY_DETAILFIELDS
-            ,u"" PROPERTY_PREVIEW_COUNT
+             PROPERTY_CHARTTYPE
+            ,PROPERTY_MASTERFIELDS
+            ,PROPERTY_DETAILFIELDS
+            ,PROPERTY_PREVIEW_COUNT
         };
 
         for (const auto & rName : s_pProperties)
diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx
index 7698ea94fca3..fe8c5bae2527 100644
--- a/reportdesign/source/ui/inspection/metadata.cxx
+++ b/reportdesign/source/ui/inspection/metadata.cxx
@@ -245,36 +245,36 @@ namespace rptui
                 u"ControlLabel", /// TODO: has to be checked
                 u"LabelControl",
                 u"Title", // comment this out if you want to have title feature for charts
-                u"" PROPERTY_MAXTEXTLEN,
-                u"" PROPERTY_EFFECTIVEDEFAULT,
-                u"" PROPERTY_EFFECTIVEMAX,
-                u"" PROPERTY_EFFECTIVEMIN,
+                PROPERTY_MAXTEXTLEN,
+                PROPERTY_EFFECTIVEDEFAULT,
+                PROPERTY_EFFECTIVEMAX,
+                PROPERTY_EFFECTIVEMIN,
                 u"HideInactiveSelection",
                 u"SubmitAction",
                 u"InputRequired",
                 u"VerticalAlign",
-                u"" PROPERTY_ALIGN,
-                u"" PROPERTY_EMPTY_IS_NULL,
-                u"" PROPERTY_FILTERPROPOSAL
-                ,u"" PROPERTY_POSITIONX
-                ,u"" PROPERTY_POSITIONY
-                ,u"" PROPERTY_WIDTH
-                ,u"" PROPERTY_HEIGHT
-                ,u"" PROPERTY_AUTOGROW
-                ,u"" PROPERTY_FONT
-                ,u"" PROPERTY_LABEL
-                ,u"" PROPERTY_LINECOLOR
-                ,u"" PROPERTY_BORDER
-                ,u"" PROPERTY_BORDERCOLOR
-                ,u"" PROPERTY_BACKTRANSPARENT
-                ,u"" PROPERTY_CONTROLBACKGROUND
-                ,u"" PROPERTY_BACKGROUNDCOLOR
-                ,u"" PROPERTY_CONTROLBACKGROUNDTRANSPARENT
-                ,u"" PROPERTY_FORMULALIST
-                ,u"" PROPERTY_SCOPE
-                ,u"" PROPERTY_TYPE
-                ,u"" PROPERTY_DATASOURCENAME
-                ,u"" PROPERTY_VERTICALALIGN
+                PROPERTY_ALIGN,
+                PROPERTY_EMPTY_IS_NULL,
+                PROPERTY_FILTERPROPOSAL
+                ,PROPERTY_POSITIONX
+                ,PROPERTY_POSITIONY
+                ,PROPERTY_WIDTH
+                ,PROPERTY_HEIGHT
+                ,PROPERTY_AUTOGROW
+                ,PROPERTY_FONT
+                ,PROPERTY_LABEL
+                ,PROPERTY_LINECOLOR
+                ,PROPERTY_BORDER
+                ,PROPERTY_BORDERCOLOR
+                ,PROPERTY_BACKTRANSPARENT
+                ,PROPERTY_CONTROLBACKGROUND
+                ,PROPERTY_BACKGROUNDCOLOR
+                ,PROPERTY_CONTROLBACKGROUNDTRANSPARENT
+                ,PROPERTY_FORMULALIST
+                ,PROPERTY_SCOPE
+                ,PROPERTY_TYPE
+                ,PROPERTY_DATASOURCENAME
+                ,PROPERTY_VERTICALALIGN
         };
 
         for (beans::Property const & prop : aProps)