writerfilter/source/dmapper/DomainMapper.cxx | 4 ++++
writerfilter/source/ooxml/model.xml | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit fafe3063bf4aac2e373e3178c12f5969da092203
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Fri May 23 17:07:05 2014 +0200
DOCX import: tokenize <w:ptab>
By changing the resource to Properties, the defined attribute tokens
actually show up, and the \t characters still arrive.
Change-Id: I37b32c4fc049b74d3bebada455b2acf47b66fc5f
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 0050b89..da9bfcf 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -927,6 +927,10 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
case NS_ooxml::LN_CT_DataBinding_storeItemID:
m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag,
"ooxml:CT_DataBinding_storeItemID", sStringValue);
break;
+ case NS_ooxml::LN_CT_PTab_leader:
+ case NS_ooxml::LN_CT_PTab_relativeTo:
+ case NS_ooxml::LN_CT_PTab_alignment:
+ break;
default:
{
#if OSL_DEBUG_LEVEL > 0
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index 36a37f6..ae7132a 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -24756,7 +24756,7 @@
<value tokenid="ooxml:Value_ST_PTabLeader_underscore">underscore</value>
<value tokenid="ooxml:Value_ST_PTabLeader_middleDot">middleDot</value>
</resource>
- <resource name="CT_PTab" resource="Stream" tag="paragraph">
+ <resource name="CT_PTab" resource="Properties" tag="paragraph">
<attribute name="alignment" tokenid="ooxml:CT_PTab_alignment"/>
<attribute name="relativeTo" tokenid="ooxml:CT_PTab_relativeTo"/>
<attribute name="leader" tokenid="ooxml:CT_PTab_leader"/>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
