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 /writerfilter/source | |
| parent | 2db20a6d2cc51a8bec911f8c8ccefa94f5d5a2e3 (diff) | |
oox: tokenize wp14 namespace
Change-Id: I6562cf7f9f090edf94ede2935233966d9dc4066f
Diffstat (limited to 'writerfilter/source')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/resourcemodel/namespace_preprocess.pl | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 82e36bdfae14..5ef81cfb93d4 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 5897a8d471be..502fb413c594 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> |