diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-24 11:17:27 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-24 11:29:06 +0100 |
| commit | 9820a8b2a0d89c355db5a363857c410125b54214 (patch) | |
| tree | 328adc144750a91772ce8d17ebe02ae40d1b5fc9 /oox | |
| parent | 2db20a6d2cc51a8bec911f8c8ccefa94f5d5a2e3 (diff) | |
oox: tokenize wp14 namespace
Change-Id: I6562cf7f9f090edf94ede2935233966d9dc4066f
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/shapecontext.cxx | 4 | ||||
| -rw-r--r-- | oox/source/token/namespaces.pl | 2 | ||||
| -rw-r--r-- | oox/source/token/namespaces.txt | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/oox/source/drawingml/shapecontext.cxx b/oox/source/drawingml/shapecontext.cxx index cf844d3ca276..eef5a788dd3a 100644 --- a/oox/source/drawingml/shapecontext.cxx +++ b/oox/source/drawingml/shapecontext.cxx @@ -116,6 +116,10 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 aElementToken, const break; case XML_txbx: break; + case XML_cNvPicPr: + break; + case XML_nvPicPr: + break; default: SAL_WARN("oox", "ShapeContext::onCreateContext: unhandled element: " << getBaseToken(aElementToken)); break; diff --git a/oox/source/token/namespaces.pl b/oox/source/token/namespaces.pl index 25ffdc25420d..225b8f7f0ef2 100644 --- a/oox/source/token/namespaces.pl +++ b/oox/source/token/namespaces.pl @@ -38,7 +38,7 @@ while( <INFILE> ) if( $_ ) { # check for valid characters - $_ =~ /^([a-zA-Z]+)\s+([a-zA-Z0-9-.:\/]+)\s*$/ or die "Error: invalid character in input data"; + $_ =~ /^([a-zA-Z][a-zA-Z0-9]*)\s+([a-zA-Z0-9-.:\/]+)\s*$/ or die "Error: invalid character in input data"; $namespaces{$1} = $2; } } diff --git a/oox/source/token/namespaces.txt b/oox/source/token/namespaces.txt index e62c38d54202..86ee4101fcaf 100644 --- a/oox/source/token/namespaces.txt +++ b/oox/source/token/namespaces.txt @@ -73,6 +73,7 @@ mce http://schemas.openxmlformats.org/markup-compatibility/2 mceTest http://schemas.openxmlformats.org/spreadsheetml/2006/main/v2 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 # extlst namespaces |