diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2015-11-07 12:55:44 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2015-11-08 19:39:14 +0100 |
| commit | 2ac998ff87da438770508fcfa034b56812f9013b (patch) | |
| tree | 83da84cab311fe6c40a62d1798291a7a3e3e560e | |
| parent | 22d45179c368efb808306ca4159049ea6a8bef61 (diff) | |
oox: define p14 namespace in strict, define P14_TOKEN
Change-Id: I9c92b9a637f43fd425cd0741e480b72ee5cff919
| -rw-r--r-- | oox/source/token/namespaces-strict.txt | 4 | ||||
| -rw-r--r-- | oox/source/token/namespaces.hxx.tail | 1 | ||||
| -rw-r--r-- | oox/source/token/namespaces.txt | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/oox/source/token/namespaces-strict.txt b/oox/source/token/namespaces-strict.txt index 026fcfe8ded9..74efa82039d8 100644 --- a/oox/source/token/namespaces-strict.txt +++ b/oox/source/token/namespaces-strict.txt @@ -70,11 +70,15 @@ dcTerms http://purl.org/dc/terms/ xm http://schemas.microsoft.com/office/excel/2006/main mce http://schemas.openxmlformats.org/markup-compatibility/2006 mceTest http://schemas.openxmlformats.org/spreadsheetml/2006/main/v2 + +# MSO 2010 extensions --------------------------------------------------------- + wps http://schemas.microsoft.com/office/word/2010/wordprocessingShape wpg http://schemas.microsoft.com/office/word/2010/wordprocessingGroup wp14 http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing w14 http://schemas.microsoft.com/office/word/2010/wordml a14 http://schemas.microsoft.com/office/drawingml/2010/main +p14 http://schemas.microsoft.com/office/powerpoint/2010/main # extlst namespaces diff --git a/oox/source/token/namespaces.hxx.tail b/oox/source/token/namespaces.hxx.tail index 24de6457698a..792228ccd32f 100644 --- a/oox/source/token/namespaces.hxx.tail +++ b/oox/source/token/namespaces.hxx.tail @@ -40,6 +40,7 @@ inline sal_Int32 getNamespace( sal_Int32 nToken ) { return nToken & NMSP_MASK; } #define O_TOKEN( token ) OOX_TOKEN( vmlOffice, token ) #define PC_TOKEN( token ) OOX_TOKEN( packageContentTypes, token ) #define PPT_TOKEN( token ) OOX_TOKEN( ppt, token ) +#define P14_TOKEN( token ) OOX_TOKEN( p14, token ) #define PR_TOKEN( token ) OOX_TOKEN( packageRel, token ) #define R_TOKEN( token ) OOX_TOKEN( officeRel, token ) #define VML_TOKEN( token ) OOX_TOKEN( vml, token ) diff --git a/oox/source/token/namespaces.txt b/oox/source/token/namespaces.txt index 5d3232e0cd77..b309dc6ca40f 100644 --- a/oox/source/token/namespaces.txt +++ b/oox/source/token/namespaces.txt @@ -71,7 +71,7 @@ xm http://schemas.microsoft.com/office/excel/2006/main mce http://schemas.openxmlformats.org/markup-compatibility/2006 mceTest http://schemas.openxmlformats.org/spreadsheetml/2006/main/v2 -# MSO 2010 extensions ----------------------------------------------------------------------- +# MSO 2010 extensions --------------------------------------------------------- wps http://schemas.microsoft.com/office/word/2010/wordprocessingShape wpg http://schemas.microsoft.com/office/word/2010/wordprocessingGroup |