diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-04 14:52:50 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-04 15:22:03 +0100 |
| commit | d4048a83443900a4b54271489a145ef0b6d7bf1d (patch) | |
| tree | ea93e597f273029c27479e2513b2be408e628e80 | |
| parent | 660127241f23bf1d665b1a3b64e0f16155488d9b (diff) | |
writerfilter: stop producing NS_rtf::LN_XSTZNAME1 in rtftok
The already existing NS_ooxml::LN_CT_Style_name token does what we need
as well, remove unnecessary duplication.
Change-Id: I348001925dba126f8f3dc7fef01e9bd503288b69
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.cxx | 5 | ||||
| -rw-r--r-- | writerfilter/source/doctok/resources.xmi | 12 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 |
4 files changed, 1 insertions, 20 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 699dea5b606d..5e49e38de101 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -732,8 +732,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) m_pImpl->AddBookmark( sLocalBookmarkName, sStringValue ); sLocalBookmarkName = OUString(); break; - case NS_rtf::LN_XSTZNAME1: - break; case NS_rtf::LN_TLC: //tab leading characters - for decimal tabs case NS_rtf::LN_JC: diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 97a1ade41e10..f55d804b705b 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -455,11 +455,6 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val) case NS_rtf::LN_UNUSED8_3: //noone seems to care about it break; - case NS_rtf::LN_XSTZNAME1: - m_pImpl->m_pCurrentEntry->sStyleName = sValue; - if (!m_pImpl->m_pCurrentEntry->sStyleIdentifierI.isEmpty()) - m_pImpl->m_pCurrentEntry->sStyleIdentifierI = sValue; - break; case NS_ooxml::LN_CT_Style_type: { SAL_WARN_IF( m_pImpl->m_pCurrentEntry->nStyleTypeCode != STYLE_TYPE_UNKNOWN, diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index 9f49d2208d42..f27a1b543a14 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -3365,18 +3365,6 @@ </UML:ModelElement.taggedValue> </UML:Attribute> </UML:Classifier.feature> - <UML:Classifier.feature> - <UML:Operation name="xstzName1"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:XSTZNAME1</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="opid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Operation> - </UML:Classifier.feature> </UML:Class> <!--Class Style--> <!--Class Fib--> diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index c229edc3fa57..b8506c562875 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -1057,7 +1057,7 @@ void RTFDocumentImpl::text(OUString& rString) if (m_aStates.top().aTableAttributes.find(NS_rtf::LN_SGC)) { RTFValue::Pointer_t pValue(new RTFValue(m_aStates.top().aDestinationText.makeStringAndClear())); - m_aStates.top().aTableAttributes.set(NS_rtf::LN_XSTZNAME1, pValue); + m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Style_name, pValue); writerfilter::Reference<Properties>::Pointer_t const pProp( new RTFReferenceProperties(mergeAttributes(), mergeSprms()) |