diff options
| author | Daniel Rentz [dr] <daniel.rentz@oracle.com> | 2011-01-17 10:59:07 +0100 |
|---|---|---|
| committer | Daniel Rentz [dr] <daniel.rentz@oracle.com> | 2011-01-17 10:59:07 +0100 |
| commit | fd2917575b28c5fde2af29ed7738447bb0aae99b (patch) | |
| tree | e28f444f0f3818be3f73f4d95cfe267f3b54e1b6 | |
| parent | 46609bbf0fbcef0c4b9cc835c31e54a93d80c404 (diff) | |
dr78: minor changes in token macros
| -rwxr-xr-x | oox/source/token/namespaces.hxx.tail | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/oox/source/token/namespaces.hxx.tail b/oox/source/token/namespaces.hxx.tail index 651fc38511d4..1e6ba5881589 100755 --- a/oox/source/token/namespaces.hxx.tail +++ b/oox/source/token/namespaces.hxx.tail @@ -1,8 +1,8 @@ // ============================================================================ -const sal_Int32 TOKEN_MASK = static_cast< sal_Int32 >( (1 << NMSP_SHIFT) - 1 ); -const sal_Int32 NMSP_MASK = static_cast< sal_Int32 >( SAL_MAX_INT16 & ~TOKEN_MASK ); +const sal_Int32 TOKEN_MASK = static_cast< sal_Int32 >( (1 << NMSP_SHIFT) - 1 ); +const sal_Int32 NMSP_MASK = static_cast< sal_Int32 >( SAL_MAX_INT16 & ~TOKEN_MASK ); /** Returns the raw token identifier without namespace of the passed token. */ inline sal_Int32 getBaseToken( sal_Int32 nToken ) { return nToken & TOKEN_MASK; } @@ -10,23 +10,26 @@ inline sal_Int32 getBaseToken( sal_Int32 nToken ) { return nToken & TOKEN_MASK; /** Returns the namespace without token identifier of the passed token. */ inline sal_Int32 getNamespace( sal_Int32 nToken ) { return nToken & NMSP_MASK; } + // defines for tokens with specific namespaces -#define A_TOKEN( token ) (::oox::NMSP_dml | XML_##token) -#define AX_TOKEN( token ) (::oox::NMSP_ax | XML_##token) -#define C_TOKEN( token ) (::oox::NMSP_dmlChart | XML_##token) -#define CDR_TOKEN( token ) (::oox::NMSP_dmlChartDr | XML_##token) -#define DGM_TOKEN( token ) (::oox::NMSP_dmlDiagram | XML_##token) -#define O_TOKEN( token ) (::oox::NMSP_vmlOffice | XML_##token) -#define PC_TOKEN( token ) (::oox::NMSP_packageContentTypes | XML_##token) -#define PPT_TOKEN( token ) (::oox::NMSP_ppt | XML_##token) -#define PR_TOKEN( token ) (::oox::NMSP_packageRel | XML_##token) -#define R_TOKEN( token ) (::oox::NMSP_officeRel | XML_##token) -#define VML_TOKEN( token ) (::oox::NMSP_vml | XML_##token) -#define VMLX_TOKEN( token ) (::oox::NMSP_vmlExcel | XML_##token) -#define XDR_TOKEN( token ) (::oox::NMSP_dmlSpreadDr | XML_##token) -#define XLS_TOKEN( token ) (::oox::NMSP_xls | XML_##token) -#define XM_TOKEN( token ) (::oox::NMSP_xm | XML_##token) -#define XML_TOKEN( token ) (::oox::NMSP_xml | XML_##token) +#define OOX_TOKEN( token, namespace ) (::oox::XML_##token | ::oox::NMSP_##namespace) + +#define A_TOKEN( token ) OOX_TOKEN( token, dml ) +#define AX_TOKEN( token ) OOX_TOKEN( token, ax ) +#define C_TOKEN( token ) OOX_TOKEN( token, dmlChart ) +#define CDR_TOKEN( token ) OOX_TOKEN( token, dmlChartDr ) +#define DGM_TOKEN( token ) OOX_TOKEN( token, dmlDiagram ) +#define O_TOKEN( token ) OOX_TOKEN( token, vmlOffice ) +#define PC_TOKEN( token ) OOX_TOKEN( token, packageContentTypes ) +#define PPT_TOKEN( token ) OOX_TOKEN( token, ppt ) +#define PR_TOKEN( token ) OOX_TOKEN( token, packageRel ) +#define R_TOKEN( token ) OOX_TOKEN( token, officeRel ) +#define VML_TOKEN( token ) OOX_TOKEN( token, vml ) +#define VMLX_TOKEN( token ) OOX_TOKEN( token, vmlExcel ) +#define XDR_TOKEN( token ) OOX_TOKEN( token, dmlSpreadDr ) +#define XLS_TOKEN( token ) OOX_TOKEN( token, xls ) +#define XM_TOKEN( token ) OOX_TOKEN( token, xm ) +#define XML_TOKEN( token ) OOX_TOKEN( token, xml ) // ============================================================================ |