diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-05-23 17:07:05 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-05-23 17:14:19 +0200 |
| commit | fafe3063bf4aac2e373e3178c12f5969da092203 (patch) | |
| tree | bfa92befe8e608818b1fe02977b82597199b2aec | |
| parent | fa2fcc2074ac102d8592fdf2b429ef369dd501f3 (diff) | |
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
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 4 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/model.xml | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 0050b89247ce..da9bfcf1dab6 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 36a37f61e736..ae7132acffb0 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"/> |