diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-06-27 15:25:53 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-06-27 16:22:38 +0200 |
| commit | 6e427e0bd194ae74e704e2cdbe6fe183eafbf4c5 (patch) | |
| tree | 8f8b6b715e55e4158d3e1f7b5911d7f62a1771c5 /include/xmloff | |
| parent | 7567074894a7ad48a82ea35eead51bac9fafa19b (diff) | |
xmloff: remove duplicate XML_NAMESPACE_##prefix##_IDX macros
Why do we need 2 identical constants?
Change-Id: Ib969f9b9583261f26fe65e04f183bdfabcb9eefe
Diffstat (limited to 'include/xmloff')
| -rw-r--r-- | include/xmloff/xmlnmspe.hxx | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/include/xmloff/xmlnmspe.hxx b/include/xmloff/xmlnmspe.hxx index 3153ad0f83fd..d1811e258ab4 100644 --- a/include/xmloff/xmlnmspe.hxx +++ b/include/xmloff/xmlnmspe.hxx @@ -23,13 +23,10 @@ #include <sal/types.h> #define XML_NAMESPACE( prefix, key ) \ -const sal_uInt16 XML_NAMESPACE_##prefix = key; \ -const sal_uInt16 XML_NAMESPACE_##prefix##_IDX = key; +const sal_uInt16 XML_NAMESPACE_##prefix = key; #define XML_OLD_NAMESPACE( prefix, index ) \ const sal_uInt16 XML_OLD_NAMESPACE_##prefix = \ - (XML_OLD_NAMESPACE_BASE+index); \ -const sal_uInt16 XML_OLD_NAMESPACE_##prefix##_IDX = \ (XML_OLD_NAMESPACE_BASE+index); // current namespaces @@ -78,8 +75,7 @@ XML_NAMESPACE( VERSIONS_LIST, 37U ) #define XML_NAMESPACE_EXT_BASE 38U #define XML_NAMESPACE_EXT( prefix, index ) \ -const sal_uInt16 XML_NAMESPACE_##prefix##_EXT = (XML_NAMESPACE_EXT_BASE+index); \ -const sal_uInt16 XML_NAMESPACE_##prefix##_EXT_IDX = (XML_NAMESPACE_EXT_BASE+index); +const sal_uInt16 XML_NAMESPACE_##prefix##_EXT = (XML_NAMESPACE_EXT_BASE+index); XML_NAMESPACE_EXT( OFFICE, 0U ) XML_NAMESPACE_EXT( TABLE, 1U ) @@ -92,8 +88,7 @@ XML_NAMESPACE_EXT( LO, 5U ) #define XML_NAMESPACE_OOO_BASE 44U #define XML_NAMESPACE_OOO( prefix, index ) \ -const sal_uInt16 XML_NAMESPACE_##prefix##_OOO = (XML_NAMESPACE_OOO_BASE+index); \ -const sal_uInt16 XML_NAMESPACE_##prefix##_OOO_IDX = (XML_NAMESPACE_OOO_BASE+index); +const sal_uInt16 XML_NAMESPACE_##prefix##_OOO = (XML_NAMESPACE_OOO_BASE+index); XML_NAMESPACE_OOO( OFFICE, 0U ) XML_NAMESPACE_OOO( META, 1U ) @@ -111,8 +106,7 @@ XML_NAMESPACE_OOO( SCRIPT, 12U ) #define XML_NAMESPACE_COMPAT_BASE 57U #define XML_NAMESPACE_COMPAT( prefix, index ) \ -const sal_uInt16 XML_NAMESPACE_##prefix##_COMPAT = (XML_NAMESPACE_COMPAT_BASE+index); \ -const sal_uInt16 XML_NAMESPACE_##prefix##_COMPAT_IDX = (XML_NAMESPACE_COMPAT_BASE+index); +const sal_uInt16 XML_NAMESPACE_##prefix##_COMPAT = (XML_NAMESPACE_COMPAT_BASE+index); XML_NAMESPACE_COMPAT( SVG, 0U ) XML_NAMESPACE_COMPAT( FO, 1U ) @@ -120,8 +114,7 @@ XML_NAMESPACE_COMPAT( SMIL, 2U ) #define XML_NAMESPACE_OASIS_BASE 60U #define XML_NAMESPACE_OASIS( prefix, index ) \ -const sal_uInt16 XML_NAMESPACE_##prefix##_OASIS = (XML_NAMESPACE_OASIS_BASE+index); \ -const sal_uInt16 XML_NAMESPACE_##prefix##_OASIS_IDX = (XML_NAMESPACE_OASIS_BASE+index); +const sal_uInt16 XML_NAMESPACE_##prefix##_OASIS = (XML_NAMESPACE_OASIS_BASE+index); XML_NAMESPACE_OASIS( DB, 0U ) XML_NAMESPACE_OASIS( REPORT, 1U ) |