writerfilter: drop unused FONTTABLE from doctok

Change-Id: I244cd35bd4fd935ec814e121ebed16d5402d6880

4 files changed, 5 insertions, 31 deletions

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 5e151e6e8843..cf7de0d77acd 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 7c3f1a9a3155..b27180fdb22e 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 bf556ae78631..67734c4a6dd8 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 c30e943c0c1c..06c9f61e0d2b 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: