[Libreoffice-commits] core.git: oox/source writerfilter/source

[Miklos Vajna]

 oox/source/drawingml/shapecontext.cxx                     |    4 ++++
 oox/source/token/namespaces.pl                            |    2 +-
 oox/source/token/namespaces.txt                           |    1 +
 writerfilter/source/dmapper/DomainMapper.cxx              |    2 ++
 writerfilter/source/resourcemodel/namespace_preprocess.pl |    2 +-
 5 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 9820a8b2a0d89c355db5a363857c410125b54214
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Jan 24 11:17:27 2014 +0100

    oox: tokenize wp14 namespace
    
    Change-Id: I6562cf7f9f090edf94ede2935233966d9dc4066f

diff --git a/oox/source/drawingml/shapecontext.cxx b/oox/source/drawingml/shapecontext.cxx
index cf844d3..eef5a78 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 25ffdc2..225b8f7 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 e62c38d..86ee410 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
 
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 82e36bd..5ef81cf 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -261,6 +261,8 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
             m_pImpl->AddBookmark( sLocalBookmarkName, sStringValue );
             sLocalBookmarkName = OUString();
         break;
+        case NS_ooxml::LN_CT_MarkupRange_displacedByCustomXml:
+            break;
         case NS_ooxml::LN_NUMBERING:
             break;
         case NS_ooxml::LN_FONTTABLE:
diff --git a/writerfilter/source/resourcemodel/namespace_preprocess.pl b/writerfilter/source/resourcemodel/namespace_preprocess.pl
index 5897a8d..502fb41 100644
--- a/writerfilter/source/resourcemodel/namespace_preprocess.pl
+++ b/writerfilter/source/resourcemodel/namespace_preprocess.pl
@@ -52,7 +52,7 @@ while ( <NAMESPACES> )
 {
     chomp( $_ );
     # line format is: numeric-id short-name namespace-URL
-    $_ =~ /^([0-9]+)\s+([a-zA-Z]+)\s+([a-zA-Z0-9-.:\/]+)\s*$/ or die "Error: invalid character in input data";
+    $_ =~ /^([0-9]+)\s+([a-zA-Z][a-zA-Z0-9]*)\s+([a-zA-Z0-9-.:\/]+)\s*$/ or die "Error: invalid character in input data";
     print <<EOF;
       <xsl:when test="\$id = '$2'">
         <xsl:text>$1</xsl:text>