expand out namespace macros

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

1 files changed, 84 insertions, 104 deletions

diff --git a/include/xmloff/xmlnmspe.hxx b/include/xmloff/xmlnmspe.hxx
index a00628b6b999..b61e5581e381 100644
--- a/include/xmloff/xmlnmspe.hxx
+++ b/include/xmloff/xmlnmspe.hxx
@@ -22,121 +22,101 @@
 
 #include <sal/types.h>
 
-#define XML_NAMESPACE( prefix, key ) \
-const sal_uInt16 prefix = key;
-
 // current namespaces
 // These namespaces have the same index in the namespace table as prefix used.
 // If a namespace is added, XML_OLD_NAMESPACE_BASE has to be adjusted!
-XML_NAMESPACE( XML_NAMESPACE_OFFICE,          0U )
-XML_NAMESPACE( XML_NAMESPACE_STYLE,           1U )
-XML_NAMESPACE( XML_NAMESPACE_TEXT ,           2U )
-XML_NAMESPACE( XML_NAMESPACE_TABLE,           3U )
-XML_NAMESPACE( XML_NAMESPACE_DRAW ,           4U )
-XML_NAMESPACE( XML_NAMESPACE_FO   ,           5U )
-XML_NAMESPACE( XML_NAMESPACE_XLINK,           6U )
-XML_NAMESPACE( XML_NAMESPACE_DC   ,           7U )
-XML_NAMESPACE( XML_NAMESPACE_META ,           8U )
-XML_NAMESPACE( XML_NAMESPACE_NUMBER,          9U )
-XML_NAMESPACE( XML_NAMESPACE_PRESENTATION,    10U )
-XML_NAMESPACE( XML_NAMESPACE_SVG,             11U )
-XML_NAMESPACE( XML_NAMESPACE_CHART,           12U )
-XML_NAMESPACE( XML_NAMESPACE_DR3D,            13U )
-XML_NAMESPACE( XML_NAMESPACE_MATH,            14U )
-XML_NAMESPACE( XML_NAMESPACE_FORM,            15U )
-XML_NAMESPACE( XML_NAMESPACE_SCRIPT,          16U )
-XML_NAMESPACE( XML_NAMESPACE_BLOCKLIST,       17U )
-XML_NAMESPACE( XML_NAMESPACE_FRAMEWORK,       18U )
-XML_NAMESPACE( XML_NAMESPACE_CONFIG,          19U )
-XML_NAMESPACE( XML_NAMESPACE_OOO,             20U )
-XML_NAMESPACE( XML_NAMESPACE_OOOW,            21U )
-XML_NAMESPACE( XML_NAMESPACE_OOOC,            22U )
-XML_NAMESPACE( XML_NAMESPACE_DOM,             23U )
-XML_NAMESPACE( XML_NAMESPACE_TCD,             24U )   // text conversion dictionary
-XML_NAMESPACE( XML_NAMESPACE_DB,              25U )
-XML_NAMESPACE( XML_NAMESPACE_DLG,             26U )
-XML_NAMESPACE( XML_NAMESPACE_XFORMS,          27U )
-XML_NAMESPACE( XML_NAMESPACE_XSD,             28U )
-XML_NAMESPACE( XML_NAMESPACE_XSI,             29U )
-XML_NAMESPACE( XML_NAMESPACE_SMIL,            30U )
-XML_NAMESPACE( XML_NAMESPACE_ANIMATION,       31U )
-XML_NAMESPACE( XML_NAMESPACE_XML,             32U )
-XML_NAMESPACE( XML_NAMESPACE_REPORT,          33U )
-XML_NAMESPACE( XML_NAMESPACE_OF,              34U )   // OpenFormula aka ODFF
-XML_NAMESPACE( XML_NAMESPACE_XHTML,           35U )
-XML_NAMESPACE( XML_NAMESPACE_GRDDL,           36U )
-XML_NAMESPACE( XML_NAMESPACE_VERSIONS_LIST,   37U )
+constexpr sal_uInt16 XML_NAMESPACE_OFFICE =           0;
+constexpr sal_uInt16 XML_NAMESPACE_STYLE =            1;
+constexpr sal_uInt16 XML_NAMESPACE_TEXT =             2;
+constexpr sal_uInt16 XML_NAMESPACE_TABLE =            3;
+constexpr sal_uInt16 XML_NAMESPACE_DRAW =             4;
+constexpr sal_uInt16 XML_NAMESPACE_FO   =             5;
+constexpr sal_uInt16 XML_NAMESPACE_XLINK =            6;
+constexpr sal_uInt16 XML_NAMESPACE_DC   =             7;
+constexpr sal_uInt16 XML_NAMESPACE_META =             8;
+constexpr sal_uInt16 XML_NAMESPACE_NUMBER =           9;
+constexpr sal_uInt16 XML_NAMESPACE_PRESENTATION =    10;
+constexpr sal_uInt16 XML_NAMESPACE_SVG =             11;
+constexpr sal_uInt16 XML_NAMESPACE_CHART =           12;
+constexpr sal_uInt16 XML_NAMESPACE_DR3D =            13;
+constexpr sal_uInt16 XML_NAMESPACE_MATH =            14;
+constexpr sal_uInt16 XML_NAMESPACE_FORM =            15;
+constexpr sal_uInt16 XML_NAMESPACE_SCRIPT =          16;
+constexpr sal_uInt16 XML_NAMESPACE_BLOCKLIST =       17;
+constexpr sal_uInt16 XML_NAMESPACE_FRAMEWORK =       18;
+constexpr sal_uInt16 XML_NAMESPACE_CONFIG =          19;
+constexpr sal_uInt16 XML_NAMESPACE_OOO =             20;
+constexpr sal_uInt16 XML_NAMESPACE_OOOW =            21;
+constexpr sal_uInt16 XML_NAMESPACE_OOOC =            22;
+constexpr sal_uInt16 XML_NAMESPACE_DOM =             23;
+constexpr sal_uInt16 XML_NAMESPACE_TCD =             24;   // text conversion dictionary
+constexpr sal_uInt16 XML_NAMESPACE_DB =              25;
+constexpr sal_uInt16 XML_NAMESPACE_DLG =             26;
+constexpr sal_uInt16 XML_NAMESPACE_XFORMS =          27;
+constexpr sal_uInt16 XML_NAMESPACE_XSD =             28;
+constexpr sal_uInt16 XML_NAMESPACE_XSI =             29;
+constexpr sal_uInt16 XML_NAMESPACE_SMIL =            30;
+constexpr sal_uInt16 XML_NAMESPACE_ANIMATION =       31;
+constexpr sal_uInt16 XML_NAMESPACE_XML =             32;
+constexpr sal_uInt16 XML_NAMESPACE_REPORT =          33;
+constexpr sal_uInt16 XML_NAMESPACE_OF =              34;   // OpenFormula aka ODFF
+constexpr sal_uInt16 XML_NAMESPACE_XHTML =           35;
+constexpr sal_uInt16 XML_NAMESPACE_GRDDL =           36;
+constexpr sal_uInt16 XML_NAMESPACE_VERSIONS_LIST =   37;
 
 // namespaces for odf extended formats
-
-#define XML_NAMESPACE_EXT_BASE 38U
-#define XML_NAMESPACE_EXT( prefix, index ) \
-const sal_uInt16 prefix = (XML_NAMESPACE_EXT_BASE+index);
-
-XML_NAMESPACE_EXT( XML_NAMESPACE_OFFICE_EXT,       0U )
-XML_NAMESPACE_EXT( XML_NAMESPACE_TABLE_EXT,        1U )
-XML_NAMESPACE_EXT( XML_NAMESPACE_CHART_EXT,        2U )
-XML_NAMESPACE_EXT( XML_NAMESPACE_DRAW_EXT,         3U )
-XML_NAMESPACE_EXT( XML_NAMESPACE_CALC_EXT,         4U )
-XML_NAMESPACE_EXT( XML_NAMESPACE_LO_EXT,           5U )
+constexpr sal_uInt16 XML_NAMESPACE_EXT_BASE   = 38;
+constexpr sal_uInt16 XML_NAMESPACE_OFFICE_EXT = XML_NAMESPACE_EXT_BASE + 0;
+constexpr sal_uInt16 XML_NAMESPACE_TABLE_EXT  = XML_NAMESPACE_EXT_BASE + 1;
+constexpr sal_uInt16 XML_NAMESPACE_CHART_EXT  = XML_NAMESPACE_EXT_BASE + 2;
+constexpr sal_uInt16 XML_NAMESPACE_DRAW_EXT   = XML_NAMESPACE_EXT_BASE + 3;
+constexpr sal_uInt16 XML_NAMESPACE_CALC_EXT   = XML_NAMESPACE_EXT_BASE + 4;
+constexpr sal_uInt16 XML_NAMESPACE_LO_EXT     = XML_NAMESPACE_EXT_BASE + 5;
 
 // namespaces for OOo formats
-
-#define XML_NAMESPACE_OOO_BASE 44U
-#define XML_NAMESPACE_OOO( prefix, index ) \
-const sal_uInt16 prefix = (XML_NAMESPACE_OOO_BASE+index);
-
-XML_NAMESPACE_OOO( XML_NAMESPACE_OFFICE_OOO,         0U )
-XML_NAMESPACE_OOO( XML_NAMESPACE_META_OOO,           1U )
-XML_NAMESPACE_OOO( XML_NAMESPACE_STYLE_OOO,          2U )
-XML_NAMESPACE_OOO( XML_NAMESPACE_NUMBER_OOO,         3U )
-XML_NAMESPACE_OOO( XML_NAMESPACE_TEXT_OOO,           4U )
-XML_NAMESPACE_OOO( XML_NAMESPACE_TABLE_OOO,          5U )
-XML_NAMESPACE_OOO( XML_NAMESPACE_DRAW_OOO,           6U )
-XML_NAMESPACE_OOO( XML_NAMESPACE_DR3D_OOO,           7U )
-XML_NAMESPACE_OOO( XML_NAMESPACE_PRESENTATION_OOO,   8U )
-XML_NAMESPACE_OOO( XML_NAMESPACE_CHART_OOO,          9U )
-XML_NAMESPACE_OOO( XML_NAMESPACE_CONFIG_OOO,        10U )
-XML_NAMESPACE_OOO( XML_NAMESPACE_FORM_OOO,          11U )
-XML_NAMESPACE_OOO( XML_NAMESPACE_SCRIPT_OOO,        12U )
-
-#define XML_NAMESPACE_COMPAT_BASE 57U
-#define XML_NAMESPACE_COMPAT( prefix, index ) \
-const sal_uInt16 prefix = (XML_NAMESPACE_COMPAT_BASE+index);
-
-XML_NAMESPACE_COMPAT( XML_NAMESPACE_SVG_COMPAT,      0U )
-XML_NAMESPACE_COMPAT( XML_NAMESPACE_FO_COMPAT,       1U )
-XML_NAMESPACE_COMPAT( XML_NAMESPACE_SMIL_COMPAT,     2U )
-
-#define XML_NAMESPACE_OASIS_BASE 60U
-#define XML_NAMESPACE_OASIS( prefix, index ) \
-const sal_uInt16 prefix = (XML_NAMESPACE_OASIS_BASE+index);
-
-XML_NAMESPACE_OASIS( XML_NAMESPACE_DB_OASIS,         0U )
-XML_NAMESPACE_OASIS( XML_NAMESPACE_REPORT_OASIS,     1U )
-
-#define XML_OLD_NAMESPACE_BASE 62U
-#define XML_OLD_NAMESPACE( prefix, index ) \
-const sal_uInt16 prefix = (XML_OLD_NAMESPACE_BASE+index);
+constexpr sal_uInt16 XML_NAMESPACE_OOO_BASE = 44U;
+constexpr sal_uInt16 XML_NAMESPACE_OFFICE_OOO = XML_NAMESPACE_OOO_BASE +         0;
+constexpr sal_uInt16 XML_NAMESPACE_META_OOO = XML_NAMESPACE_OOO_BASE +           1;
+constexpr sal_uInt16 XML_NAMESPACE_STYLE_OOO = XML_NAMESPACE_OOO_BASE +          2;
+constexpr sal_uInt16 XML_NAMESPACE_NUMBER_OOO = XML_NAMESPACE_OOO_BASE +         3;
+constexpr sal_uInt16 XML_NAMESPACE_TEXT_OOO = XML_NAMESPACE_OOO_BASE +           4;
+constexpr sal_uInt16 XML_NAMESPACE_TABLE_OOO = XML_NAMESPACE_OOO_BASE +          5;
+constexpr sal_uInt16 XML_NAMESPACE_DRAW_OOO = XML_NAMESPACE_OOO_BASE +           6;
+constexpr sal_uInt16 XML_NAMESPACE_DR3D_OOO = XML_NAMESPACE_OOO_BASE +           7;
+constexpr sal_uInt16 XML_NAMESPACE_PRESENTATION_OOO = XML_NAMESPACE_OOO_BASE +   8;
+constexpr sal_uInt16 XML_NAMESPACE_CHART_OOO = XML_NAMESPACE_OOO_BASE +          9;
+constexpr sal_uInt16 XML_NAMESPACE_CONFIG_OOO = XML_NAMESPACE_OOO_BASE +        10;
+constexpr sal_uInt16 XML_NAMESPACE_FORM_OOO = XML_NAMESPACE_OOO_BASE +          11;
+constexpr sal_uInt16 XML_NAMESPACE_SCRIPT_OOO = XML_NAMESPACE_OOO_BASE +        12;
+
+constexpr sal_uInt16 XML_NAMESPACE_COMPAT_BASE = 57;
+constexpr sal_uInt16 XML_NAMESPACE_SVG_COMPAT = XML_NAMESPACE_COMPAT_BASE +      0;
+constexpr sal_uInt16 XML_NAMESPACE_FO_COMPAT = XML_NAMESPACE_COMPAT_BASE +       1;
+constexpr sal_uInt16 XML_NAMESPACE_SMIL_COMPAT = XML_NAMESPACE_COMPAT_BASE +     2;
+
+constexpr sal_uInt16 XML_NAMESPACE_OASIS_BASE = 60;
+constexpr sal_uInt16 XML_NAMESPACE_DB_OASIS = XML_NAMESPACE_OASIS_BASE +         0;
+constexpr sal_uInt16 XML_NAMESPACE_REPORT_OASIS = XML_NAMESPACE_OASIS_BASE +     1;
 
 // namespaces used in the technical preview (SO 5.2)
-XML_OLD_NAMESPACE( XML_OLD_NAMESPACE_FO,             0U )
-XML_OLD_NAMESPACE( XML_OLD_NAMESPACE_XLINK,          1U )
-XML_OLD_NAMESPACE( XML_OLD_NAMESPACE_OFFICE,         2U )
-XML_OLD_NAMESPACE( XML_OLD_NAMESPACE_STYLE,          3U )
-XML_OLD_NAMESPACE( XML_OLD_NAMESPACE_TEXT,           4U )
-XML_OLD_NAMESPACE( XML_OLD_NAMESPACE_TABLE,          5U )
-XML_OLD_NAMESPACE( XML_OLD_NAMESPACE_META,           6U )
-XML_OLD_NAMESPACE( XML_OLD_NAMESPACE_DRAW,           7U )
-XML_OLD_NAMESPACE( XML_OLD_NAMESPACE_NUMBER,         8U )
-XML_OLD_NAMESPACE( XML_OLD_NAMESPACE_PRESENTATION,   9U )
-XML_OLD_NAMESPACE( XML_OLD_NAMESPACE_CHART,         10U )
-XML_OLD_NAMESPACE( XML_OLD_NAMESPACE_SMIL,          11U )
+constexpr sal_uInt16 XML_OLD_NAMESPACE_BASE = 62;
+constexpr sal_uInt16 XML_OLD_NAMESPACE_FO = XML_OLD_NAMESPACE_BASE +             0;
+constexpr sal_uInt16 XML_OLD_NAMESPACE_XLINK = XML_OLD_NAMESPACE_BASE +          1;
+constexpr sal_uInt16 XML_OLD_NAMESPACE_OFFICE = XML_OLD_NAMESPACE_BASE +         2;
+constexpr sal_uInt16 XML_OLD_NAMESPACE_STYLE = XML_OLD_NAMESPACE_BASE +          3;
+constexpr sal_uInt16 XML_OLD_NAMESPACE_TEXT = XML_OLD_NAMESPACE_BASE +           4;
+constexpr sal_uInt16 XML_OLD_NAMESPACE_TABLE = XML_OLD_NAMESPACE_BASE +          5;
+constexpr sal_uInt16 XML_OLD_NAMESPACE_META = XML_OLD_NAMESPACE_BASE +           6;
+constexpr sal_uInt16 XML_OLD_NAMESPACE_DRAW = XML_OLD_NAMESPACE_BASE +           7;
+constexpr sal_uInt16 XML_OLD_NAMESPACE_NUMBER = XML_OLD_NAMESPACE_BASE +         8;
+constexpr sal_uInt16 XML_OLD_NAMESPACE_PRESENTATION = XML_OLD_NAMESPACE_BASE +   9;
+constexpr sal_uInt16 XML_OLD_NAMESPACE_CHART = XML_OLD_NAMESPACE_BASE +         10;
+constexpr sal_uInt16 XML_OLD_NAMESPACE_SMIL = XML_OLD_NAMESPACE_BASE +          11;
 
 // experimental namespaces
-XML_NAMESPACE( XML_NAMESPACE_FIELD,           100U )
-XML_NAMESPACE( XML_NAMESPACE_CSS3TEXT,        103U )  // CSS Text Level 3
-XML_NAMESPACE( XML_NAMESPACE_FORMX,           101U )  // form interop extensions
+constexpr sal_uInt16 XML_NAMESPACE_FIELD =           100;
+constexpr sal_uInt16 XML_NAMESPACE_CSS3TEXT =        103;  // CSS Text Level 3
+constexpr sal_uInt16 XML_NAMESPACE_FORMX =           101;  // form interop extensions
 
 
 #endif // INCLUDED_XMLOFF_XMLNMSPE_HXX