writerfilter/source/dmapper/DomainMapper.cxx | 37 ---- writerfilter/source/doctok/resourceids.xsl | 25 --- writerfilter/source/doctok/resources.xmi | 194 ------------------------- writerfilter/source/ooxml/model.xml | 6 writerfilter/source/rtftok/rtfdocumentimpl.cxx | 8 - 5 files changed, 12 insertions(+), 258 deletions(-)
New commits: commit 6a59fbefbfbc90d6febd43e689773f88deaf36b3 Author: Miklos Vajna <[email protected]> Date: Fri Dec 27 18:04:49 2013 +0100 writerfilter: remove unused STYLESHEET in doctok Change-Id: I9160730029cf2272172b50726168390ac6093daf diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 97ae897..48278e3 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -413,22 +413,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) break; case NS_rtf::LN_FHIDDEN: break; - case NS_rtf::LN_CSTD: - break; - case NS_rtf::LN_CBSTDBASEINFILE: - break; - case NS_rtf::LN_FSTDSTYLENAMESWRITTEN: - break; - case NS_rtf::LN_UNUSED4_2: - break; - case NS_rtf::LN_STIMAXWHENSAVED: - break; - case NS_rtf::LN_ISTDMAXFIXEDWHENSAVED: - break; - case NS_rtf::LN_NVERBUILTINNAMESWHENSAVED: - break; - case NS_rtf::LN_RGFTCSTANDARDCHPSTSH: - break; case NS_rtf::LN_WIDENT: case NS_rtf::LN_NFIB: @@ -826,7 +810,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) break; case NS_ooxml::LN_FONTTABLE: break; - case NS_rtf::LN_STYLESHEET: + case NS_ooxml::LN_STYLESHEET: break; case NS_rtf::LN_fcEastAsianLayout: @@ -4096,7 +4080,7 @@ void DomainMapper::lcl_table(Id name, writerfilter::Reference<Table>::Pointer_t // each entry call inserts a new font entry ref->resolve( *m_pImpl->GetFontTable() ); break; - case NS_rtf::LN_STYLESHEET: + case NS_ooxml::LN_STYLESHEET: //same as above to import style sheets m_pImpl->SetStyleSheetImport( true ); ref->resolve( *m_pImpl->GetStyleSheetTable() ); diff --git a/writerfilter/source/doctok/resourceids.xsl b/writerfilter/source/doctok/resourceids.xsl index ff5ce87..305d193 100644 --- a/writerfilter/source/doctok/resourceids.xsl +++ b/writerfilter/source/doctok/resourceids.xsl @@ -106,31 +106,6 @@ const Id </xsl:text> </xsl:for-each> </xsl:for-each> <xsl:text> - -/* Classes */</xsl:text> -<xsl:for-each select='.//UML:Class[@name!="reserved"]'> - <xsl:variable name="pos" select="position()"/> - <xsl:for-each select='.//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref="classid"]'> - <xsl:choose> - <xsl:when test='.//UML:Stereotype[@xmi.idref="noqname"]'/> - <xsl:when test='generate-id(UML:TaggedValue.dataValue) != generate-id(key("same-valued-tagged-data", UML:TaggedValue.dataValue)[1])'/> - <xsl:otherwise> - <xsl:text> -const Id </xsl:text> -<xsl:call-template name='idtoqname'> - <xsl:with-param name='id'><xsl:value-of select='.//UML:TaggedValue.dataValue'/></xsl:with-param> -</xsl:call-template> -<xsl:text> = </xsl:text> -<xsl:value-of select='30000 + $pos'/> -<xsl:text>; // 0x</xsl:text> -<xsl:call-template name="dectohex"> - <xsl:with-param name="number" select="30000 + position()"/> -</xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:for-each> -</xsl:for-each> -<xsl:text> } namespace NS_dff diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index a79033c..4928196 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -3971,114 +3971,6 @@ </UML:Classifier.feature> </UML:Class> <!--Class Style--> - <!--Class StyleSheet--> - <UML:Class xmi.id="StyleSheet" name="StyleSheet"> - <UML:Classifier.feature> - <UML:Attribute name="cstd"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:CSTD</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="attrid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Attribute> - </UML:Classifier.feature> - <UML:Classifier.feature> - <UML:Attribute name="cbSTDBaseInFile"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:CBSTDBASEINFILE</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="attrid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Attribute> - </UML:Classifier.feature> - <UML:Classifier.feature> - <UML:Attribute name="fStdStylenamesWritten"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:FSTDSTYLENAMESWRITTEN</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="attrid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Attribute> - </UML:Classifier.feature> - <UML:Classifier.feature> - <UML:Attribute name="unused4_2"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:UNUSED4_2</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="attrid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Attribute> - </UML:Classifier.feature> - <UML:Classifier.feature> - <UML:Attribute name="stiMaxWhenSaved"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:STIMAXWHENSAVED</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="attrid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Attribute> - </UML:Classifier.feature> - <UML:Classifier.feature> - <UML:Attribute name="istdMaxFixedWhenSaved"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:ISTDMAXFIXEDWHENSAVED</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="attrid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Attribute> - </UML:Classifier.feature> - <UML:Classifier.feature> - <UML:Attribute name="nVerBuiltInNamesWhenSaved"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:NVERBUILTINNAMESWHENSAVED</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="attrid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Attribute> - </UML:Classifier.feature> - <UML:Classifier.feature> - <UML:Attribute name="rgftcStandardChpStsh"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:RGFTCSTANDARDCHPSTSH</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="attrid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Attribute> - </UML:Classifier.feature> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:STYLESHEET</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="classid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Class> - <!--Class StyleSheet--> <!--Class Fib--> <UML:Class xmi.id="Fib" name="Fib"> <UML:ModelElement.taggedValue> diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 67734c4..98580c0 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -23868,7 +23868,7 @@ <element name="numbering" tokenid="ooxml:NUMBERING"/> </resource> <resource name="styles" resource="Stream" tag="style"> - <element name="styles" tokenid="rtf:STYLESHEET"/> + <element name="styles" tokenid="ooxml:STYLESHEET"/> </resource> <resource name="ST_CaptionPos" resource="List" generated="yes"> <value name="above" tokenid="ooxml:Value_wordprocessingml_ST_CaptionPos_above">above</value> diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 585d10b..810844f 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3885,7 +3885,7 @@ int RTFDocumentImpl::popState() case DESTINATION_STYLESHEET: { writerfilter::Reference<Table>::Pointer_t const pTable(new RTFReferenceTable(m_aStyleTableEntries)); - Mapper().table(NS_rtf::LN_STYLESHEET, pTable); + Mapper().table(NS_ooxml::LN_STYLESHEET, pTable); } break; case DESTINATION_LISTOVERRIDETABLE: commit a48d76c65cdcbedaabc562bf8d4d0a2e81a1329d Author: Miklos Vajna <[email protected]> Date: Fri Dec 27 18:00:13 2013 +0100 writerfilter: remove unused LFOTABLE in doctok Change-Id: Ie10f2a8a74ad0011d994f44e12903bbc63e16dcb diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 2bacda1..97ae897 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -824,8 +824,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) case NS_ooxml::LN_NUMBERING: break; - case NS_rtf::LN_LFOTABLE: - break; case NS_ooxml::LN_FONTTABLE: break; case NS_rtf::LN_STYLESHEET: @@ -4113,14 +4111,6 @@ void DomainMapper::lcl_table(Id name, writerfilter::Reference<Table>::Pointer_t m_pImpl->GetListTable( )->CreateNumberingRules( ); } break; - case NS_rtf::LN_LFOTABLE: - { - m_pImpl->GetListTable( )->SetLFOImport( true ); - ref->resolve( *m_pImpl->GetListTable() ); - m_pImpl->GetListTable( )->CreateNumberingRules( ); - m_pImpl->GetListTable( )->SetLFOImport( false ); - } - break; case NS_ooxml::LN_THEMETABLE: m_pImpl->GetThemeTable()->setThemeFontLangProperties( m_pImpl->GetSettingsTable()->GetThemeFontLangProperties() ); diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index 1a06f93..a79033c 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -3021,26 +3021,6 @@ </UML:Generalization.parent> </UML:Generalization> <!--Class LFOData--> - <!--Class LFOTable--> - <UML:Class xmi.id="LFOTable" name="LFOTable"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:LFOTABLE</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="classid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Class> - <UML:Generalization isSpecification="false" xmi.id="LFOTable-Table"> - <UML:Generalization.child> - <UML:Class xmi.idref="LFOTable"/> - </UML:Generalization.child> - <UML:Generalization.parent> - <UML:Class xmi.idref="Table"/> - </UML:Generalization.parent> - </UML:Generalization> - <!--Class LFOTable--> <!--Class Font--> <UML:Class xmi.id="Font" name="Font"> <UML:ModelElement.taggedValue> commit 274822737c0462933ad2ca8892ac0d5790c78de2 Author: Miklos Vajna <[email protected]> Date: Fri Dec 27 17:47:43 2013 +0100 writerfilter: drop unused LISTTABLE from doctok There is NS_ooxml::LN_NUMBERING that does the same, use that instead. Also drop SttbRgtplc, that's trivial as no other tokenizer nor the dmapper referred to it. Change-Id: Ic4f3c8908f114a60186b0fb06e0fad2b2157f6de diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index cf7de0d..2bacda1 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -822,7 +822,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) OSL_FAIL("handled by DomainMapperTableManager"); break; - case NS_rtf::LN_LISTTABLE: + case NS_ooxml::LN_NUMBERING: break; case NS_rtf::LN_LFOTABLE: break; @@ -4106,7 +4106,6 @@ void DomainMapper::lcl_table(Id name, writerfilter::Reference<Table>::Pointer_t m_pImpl->SetStyleSheetImport( false ); break; case NS_ooxml::LN_NUMBERING: - case NS_rtf::LN_LISTTABLE: { //the same for list tables diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index b27180f..1a06f93 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -2288,26 +2288,6 @@ </UML:Generalization.parent> </UML:Generalization> <!--Class List--> - <!--Class ListTable--> - <UML:Class xmi.id="ListTable" name="ListTable"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:LISTTABLE</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="classid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Class> - <UML:Generalization isSpecification="false" xmi.id="ListTable-Table"> - <UML:Generalization.child> - <UML:Class xmi.idref="ListTable"/> - </UML:Generalization.child> - <UML:Generalization.parent> - <UML:Class xmi.idref="Table"/> - </UML:Generalization.parent> - </UML:Generalization> - <!--Class ListTable--> <!--Class LFOLevel--> <UML:Class xmi.id="LFOLevel" name="LFOLevel"> <UML:ModelElement.taggedValue> @@ -2963,26 +2943,6 @@ </UML:Generalization.parent> </UML:Generalization> <!--Class LFO--> - <!--Class SttbRgtplc--> - <UML:Class xmi.id="SttbRgtplc" name="SttbRgtplc"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:SttbRgtplc</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="classid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Class> - <UML:Generalization isSpecification="false" xmi.id="SttbRgtplc-Table"> - <UML:Generalization.child> - <UML:Class xmi.idref="SttbRgtplc"/> - </UML:Generalization.child> - <UML:Generalization.parent> - <UML:Class xmi.idref="Table"/> - </UML:Generalization.parent> - </UML:Generalization> - <!--Class SttbRgtplc--> <!--Class LFOData--> <UML:Class xmi.id="LFOData" name="LFOData"> <UML:ModelElement.taggedValue> diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 06c9f61..585d10b 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3895,7 +3895,7 @@ int RTFDocumentImpl::popState() RTFReferenceTable::Entries_t aListTableEntries; aListTableEntries.insert(make_pair(0, pProp)); writerfilter::Reference<Table>::Pointer_t const pTable(new RTFReferenceTable(aListTableEntries)); - Mapper().table(NS_rtf::LN_LISTTABLE, pTable); + Mapper().table(NS_ooxml::LN_NUMBERING, pTable); } break; case DESTINATION_LISTENTRY: @@ -4600,7 +4600,7 @@ int RTFDocumentImpl::popState() RTFReferenceTable::Entries_t aListTableEntries; aListTableEntries.insert(make_pair(0, pProp)); writerfilter::Reference<Table>::Pointer_t const pTable(new RTFReferenceTable(aListTableEntries)); - Mapper().table(NS_rtf::LN_LISTTABLE, pTable); + Mapper().table(NS_ooxml::LN_NUMBERING, pTable); // Use it lcl_putNestedSprm(m_aStates.top().aParagraphSprms, NS_ooxml::LN_CT_PPrBase_numPr, NS_sprm::LN_PIlvl, pIlvlValue); commit 76a891e2c09c4f8c758377161fbd662c6c876530 Author: Miklos Vajna <[email protected]> Date: Fri Dec 27 17:38:54 2013 +0100 writerfilter: drop unused FONTTABLE from doctok Change-Id: I244cd35bd4fd935ec814e121ebed16d5402d6880 diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 5e151e6..cf7de0d 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -826,7 +826,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) break; case NS_rtf::LN_LFOTABLE: break; - case NS_rtf::LN_FONTTABLE: + case NS_ooxml::LN_FONTTABLE: break; case NS_rtf::LN_STYLESHEET: break; @@ -4092,7 +4092,7 @@ void DomainMapper::lcl_table(Id name, writerfilter::Reference<Table>::Pointer_t m_pImpl->SetAnyTableImport(true); switch(name) { - case NS_rtf::LN_FONTTABLE: + case NS_ooxml::LN_FONTTABLE: // create a font table object that listens to the attributes // each entry call inserts a new font entry diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index 7c3f1a9..b27180f 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -3081,32 +3081,6 @@ </UML:Generalization.parent> </UML:Generalization> <!--Class LFOTable--> - <!--Class FontTable--> - <UML:Class xmi.id="FontTable" name="FontTable"> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="ww8nopayloadoffset"/> - </UML:ModelElement.stereotype> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="plcf"/> - </UML:ModelElement.stereotype> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:FONTTABLE</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="classid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - </UML:Class> - <UML:Generalization isSpecification="false" xmi.id="FontTable-Table"> - <UML:Generalization.child> - <UML:Class xmi.idref="FontTable"/> - </UML:Generalization.child> - <UML:Generalization.parent> - <UML:Class xmi.idref="Table"/> - </UML:Generalization.parent> - </UML:Generalization> - <!--Class FontTable--> <!--Class Font--> <UML:Class xmi.id="Font" name="Font"> <UML:ModelElement.taggedValue> diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index bf556ae..67734c4 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -23717,7 +23717,7 @@ <element name="embedBoldItalic" tokenid="ooxml:CT_Font_embedBoldItalic"/> <attribute name="name" tokenid="ooxml:CT_Font_name"/> </resource> - <resource name="CT_FontsList" resource="Table" tokenid="rtf:FONTTABLE" tag="font"/> + <resource name="CT_FontsList" resource="Table" tokenid="ooxml:FONTTABLE" tag="font"/> <resource name="EG_RunLevelElts" resource="Stream" tag="character"> <element name="proofErr" tokenid="ooxml:EG_RunLevelElts_proofErr"/> <element name="permStart" tokenid="ooxml:EG_RunLevelElts_permStart"/> @@ -23862,7 +23862,7 @@ <element name="settings" tokenid="ooxml:settings_settings"/> </resource> <resource name="fonts" resource="Stream" tag="font"> - <element name="fonts" tokenid="rtf:FONTTABLE"/> + <element name="fonts" tokenid="ooxml:FONTTABLE"/> </resource> <resource name="numbering" resource="Stream" tag="numbering"> <element name="numbering" tokenid="ooxml:NUMBERING"/> diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index c30e943..06c9f61 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3879,7 +3879,7 @@ int RTFDocumentImpl::popState() case DESTINATION_FONTTABLE: { writerfilter::Reference<Table>::Pointer_t const pTable(new RTFReferenceTable(m_aFontTableEntries)); - Mapper().table(NS_rtf::LN_FONTTABLE, pTable); + Mapper().table(NS_ooxml::LN_FONTTABLE, pTable); } break; case DESTINATION_STYLESHEET: _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
