writerfilter: let the OOXML tokenizer not generate RTF tokens

The tokens were in 3 namespaces previously: sprm, ooxml and rtf. Given
that all rtf tokens have ooxml equivalent but not the other way around,
replace remaining rtf tokens with ooxml ones (in the OOXML tokenizer) to
make this area a little bit easier to understand for a newcomer.

Change-Id: I640ecf51b0f88da2cdf41e8e79cf44b4ddbffef4

6 files changed, 17 insertions, 133 deletions

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index afefbfa62f3e..6d16bb0e301a 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -345,9 +345,9 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
             break;
         case NS_rtf::LN_CBGRPPRLPAPX:
             break;
-        case NS_rtf::LN_LSID:
+        case NS_ooxml::LN_CT_AbstractNum_nsid:
             break;
-        case NS_rtf::LN_TPLC:
+        case NS_ooxml::LN_CT_AbstractNum_tmpl:
             break;
         case NS_rtf::LN_RGISTD:
             break;
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index efd463d76ad9..e26d41a48d91 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -449,7 +449,7 @@ uno::Reference<drawing::XShape> NumPicBullet::GetShape()
 //--------------------------------------- AbstractListDef implementation
 
 AbstractListDef::AbstractListDef( ) :
-    m_nTPLC( -1 )
+    m_nTmpl( -1 )
     ,m_nSimpleList( -1 )
     ,m_nRestart( -1 )
     ,m_nUnsigned( -1 )
@@ -465,8 +465,8 @@ void AbstractListDef::SetValue( sal_uInt32 nSprmId, sal_Int32 nValue )
 {
     switch( nSprmId )
     {
-        case NS_rtf::LN_TPLC:
-            m_nTPLC = nValue;
+        case NS_ooxml::LN_CT_AbstractNum_tmpl:
+            m_nTmpl = nValue;
         break;
         case NS_rtf::LN_FSIMPLELIST:
             m_nSimpleList = nValue;
@@ -788,10 +788,10 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal )
         case NS_ooxml::LN_CT_Num_numId:
             m_pCurrentDefinition->SetId( rVal.getString().toInt32( ) );
         break;
-        case NS_rtf::LN_LSID:
+        case NS_ooxml::LN_CT_AbstractNum_nsid:
             m_pCurrentDefinition->SetId( nIntValue );
         break;
-        case NS_rtf::LN_TPLC:
+        case NS_ooxml::LN_CT_AbstractNum_tmpl:
         case NS_rtf::LN_FSIMPLELIST:
         case NS_rtf::LN_fAutoNum:
         case NS_rtf::LN_fHybrid:
@@ -978,7 +978,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
             break;
             case NS_ooxml::LN_CT_AbstractNum_multiLevelType:
             break;
-            case NS_rtf::LN_TPLC:
+            case NS_ooxml::LN_CT_AbstractNum_tmpl:
                 m_pCurrentDefinition->SetValue( nSprmId, nIntValue );
             break;
             case NS_ooxml::LN_CT_AbstractNum_lvl:
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx
index d4bc418b8a99..eef50e689c95 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -132,7 +132,7 @@ private:
 class AbstractListDef
 {
 private:
-    sal_Int32                            m_nTPLC;          //LN_TPLC
+    sal_Int32                            m_nTmpl;
     OUString                      m_sRGISTD;        //LN_RGISTD
     sal_Int32                            m_nSimpleList;    //LN_FSIMPLELIST
     sal_Int32                            m_nRestart;       //LN_FRESTARTHDN
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index 8ba1cbee375e..d63baa15a65b 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -1328,122 +1328,6 @@
             </UML:Operation>
           </UML:Classifier.feature>
           <UML:Classifier.feature>
-            <UML:Attribute name="lsid">
-              <UML:ModelElement.taggedValue>
-                <UML:TaggedValue>
-                  <UML:TaggedValue.dataValue/>
-                  <UML:TaggedValue.type>
-                    <UML:TagDefinition xmi.idref="comment"/>
-                  </UML:TaggedValue.type>
-                </UML:TaggedValue>
-              </UML:ModelElement.taggedValue>
-              <UML:ModelElement.taggedValue>
-                <UML:TaggedValue>
-                  <UML:TaggedValue.dataValue>0</UML:TaggedValue.dataValue>
-                  <UML:TaggedValue.type>
-                    <UML:TagDefinition xmi.idref="offset"/>
-                  </UML:TaggedValue.type>
-                </UML:TaggedValue>
-              </UML:ModelElement.taggedValue>
-              <UML:ModelElement.taggedValue>
-                <UML:TaggedValue>
-                  <UML:TaggedValue.dataValue/>
-                  <UML:TaggedValue.type>
-                    <UML:TagDefinition xmi.idref="shift"/>
-                  </UML:TaggedValue.type>
-                </UML:TaggedValue>
-              </UML:ModelElement.taggedValue>
-              <UML:ModelElement.taggedValue>
-                <UML:TaggedValue>
-                  <UML:TaggedValue.dataValue/>
-                  <UML:TaggedValue.type>
-                    <UML:TagDefinition xmi.idref="mask"/>
-                  </UML:TaggedValue.type>
-                </UML:TaggedValue>
-              </UML:ModelElement.taggedValue>
-              <UML:ModelElement.taggedValue>
-                <UML:TaggedValue>
-                  <UML:TaggedValue.dataValue/>
-                  <UML:TaggedValue.type>
-                    <UML:TagDefinition xmi.idref="bits"/>
-                  </UML:TaggedValue.type>
-                </UML:TaggedValue>
-              </UML:ModelElement.taggedValue>
-              <UML:ModelElement.taggedValue>
-                <UML:TaggedValue>
-                  <UML:TaggedValue.dataValue>rtf:LSID</UML:TaggedValue.dataValue>
-                  <UML:TaggedValue.type>
-                    <UML:TagDefinition xmi.idref="attrid"/>
-                  </UML:TaggedValue.type>
-                </UML:TaggedValue>
-              </UML:ModelElement.taggedValue>
-              <UML:StructuralFeature.type>
-                <UML:DataType xmi.idref="S32"/>
-              </UML:StructuralFeature.type>
-              <UML:ModelElement.stereotype>
-                <UML:Stereotype xmi.idref="attribute"/>
-              </UML:ModelElement.stereotype>
-            </UML:Attribute>
-          </UML:Classifier.feature>
-          <UML:Classifier.feature>
-            <UML:Attribute name="tplc">
-              <UML:ModelElement.taggedValue>
-                <UML:TaggedValue>
-                  <UML:TaggedValue.dataValue/>
-                  <UML:TaggedValue.type>
-                    <UML:TagDefinition xmi.idref="comment"/>
-                  </UML:TaggedValue.type>
-                </UML:TaggedValue>
-              </UML:ModelElement.taggedValue>
-              <UML:ModelElement.taggedValue>
-                <UML:TaggedValue>
-                  <UML:TaggedValue.dataValue>4</UML:TaggedValue.dataValue>
-                  <UML:TaggedValue.type>
-                    <UML:TagDefinition xmi.idref="offset"/>
-                  </UML:TaggedValue.type>
-                </UML:TaggedValue>
-              </UML:ModelElement.taggedValue>
-              <UML:ModelElement.taggedValue>
-                <UML:TaggedValue>
-                  <UML:TaggedValue.dataValue/>
-                  <UML:TaggedValue.type>
-                    <UML:TagDefinition xmi.idref="shift"/>
-                  </UML:TaggedValue.type>
-                </UML:TaggedValue>
-              </UML:ModelElement.taggedValue>
-              <UML:ModelElement.taggedValue>
-                <UML:TaggedValue>
-                  <UML:TaggedValue.dataValue/>
-                  <UML:TaggedValue.type>
-                    <UML:TagDefinition xmi.idref="mask"/>
-                  </UML:TaggedValue.type>
-                </UML:TaggedValue>
-              </UML:ModelElement.taggedValue>
-              <UML:ModelElement.taggedValue>
-                <UML:TaggedValue>
-                  <UML:TaggedValue.dataValue/>
-                  <UML:TaggedValue.type>
-                    <UML:TagDefinition xmi.idref="bits"/>
-                  </UML:TaggedValue.type>
-                </UML:TaggedValue>
-              </UML:ModelElement.taggedValue>
-              <UML:ModelElement.taggedValue>
-                <UML:TaggedValue>
-                  <UML:TaggedValue.dataValue>rtf:TPLC</UML:TaggedValue.dataValue>
-                  <UML:TaggedValue.type>
-                    <UML:TagDefinition xmi.idref="attrid"/>
-                  </UML:TaggedValue.type>
-                </UML:TaggedValue>
-              </UML:ModelElement.taggedValue>
-              <UML:StructuralFeature.type>
-                <UML:DataType xmi.idref="S32"/>
-              </UML:StructuralFeature.type>
-              <UML:ModelElement.stereotype>
-                <UML:Stereotype xmi.idref="attribute"/>
-              </UML:ModelElement.stereotype>
-            </UML:Attribute>
-          </UML:Classifier.feature>
-          <UML:Classifier.feature>
             <UML:Attribute name="fBuildIn">
               <UML:ModelElement.taggedValue>
                 <UML:TaggedValue>
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 4c40b92f6408..a7fbee9f35de 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -23574,9 +23574,9 @@
     </resource>
     <resource name="CT_AbstractNum" resource="Properties" tag="numbering">
       <kind name="paragraph"/>
-      <element name="nsid" tokenid="rtf:LSID"/>
+      <element name="nsid" tokenid="ooxml:CT_AbstractNum_nsid"/>
       <element name="multiLevelType" tokenid="ooxml:CT_AbstractNum_multiLevelType"/>
-      <element name="tmpl" tokenid="rtf:TPLC"/>
+      <element name="tmpl" tokenid="ooxml:CT_AbstractNum_tmpl"/>
       <element name="name" tokenid="ooxml:CT_AbstractNum_name"/>
       <element name="styleLink" tokenid="ooxml:CT_AbstractNum_styleLink"/>
       <element name="numStyleLink" tokenid="ooxml:CT_AbstractNum_numStyleLink"/>
@@ -23659,7 +23659,7 @@
       <attribute name="default" tokenid="ooxml:CT_Style_default"/>
       <attribute name="customStyle" tokenid="ooxml:CT_Style_customStyle"/>
     </resource>
-    <resource name="CT_Styles" resource="Table" tokenid="rtf:STYLESHEET" tag="style"/>
+    <resource name="CT_Styles" resource="Table" tokenid="ooxml:STYLESHEET" tag="style"/>
     <resource name="ST_Panose" resource="Hex"/>
     <resource name="CT_Panose" resource="Value" tag="font">
       <attribute name="val" tokenid="ooxml:CT_Panose_val" action="setValue"/>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 4278bdb7e260..3b45b939f2ba 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2708,7 +2708,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
         case RTF_PNLVLBODY:
                 {
                     RTFValue::Pointer_t pValue(new RTFValue(2));
-                    m_aStates.top().aTableAttributes.set(NS_rtf::LN_LSID, pValue);
+                    m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_AbstractNum_nsid, pValue);
                 }
                 break;
         case RTF_PNDEC:
@@ -2719,7 +2719,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
                 break;
         case RTF_PNLVLBLT:
                 {
-                    m_aStates.top().aTableAttributes.set(NS_rtf::LN_LSID, RTFValue::Pointer_t(new RTFValue(1)));
+                    m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_AbstractNum_nsid, RTFValue::Pointer_t(new RTFValue(1)));
                     m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Lvl_numFmt, RTFValue::Pointer_t(new RTFValue(23))); // bullets, same as \levelnfc23
                 }
                 break;
@@ -3159,7 +3159,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
         case RTF_LS:
             {
                 if (m_aStates.top().nDestinationState == DESTINATION_LISTOVERRIDEENTRY)
-                    m_aStates.top().aTableAttributes.set(NS_rtf::LN_LSID, pIntValue);
+                    m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_AbstractNum_nsid, pIntValue);
                 else
                     lcl_putNestedSprm(m_aStates.top().aParagraphSprms, NS_ooxml::LN_CT_PPrBase_tabs, NS_sprm::LN_PIlfo, pIntValue);
             }
@@ -4551,7 +4551,7 @@ int RTFDocumentImpl::popState()
             break;
         case DESTINATION_PARAGRAPHNUMBERING:
             {
-                RTFValue::Pointer_t pIdValue = aState.aTableAttributes.find(NS_rtf::LN_LSID);
+                RTFValue::Pointer_t pIdValue = aState.aTableAttributes.find(NS_ooxml::LN_CT_AbstractNum_nsid);
                 if (pIdValue.get())
                 {
                     // Abstract numbering
@@ -4600,7 +4600,7 @@ int RTFDocumentImpl::popState()
                     // Numbering
                     RTFSprms aNumberingAttributes;
                     RTFSprms aNumberingSprms;
-                    aNumberingAttributes.set(NS_rtf::LN_LSID, pIdValue);
+                    aNumberingAttributes.set(NS_ooxml::LN_CT_AbstractNum_nsid, pIdValue);
                     aNumberingSprms.set(NS_ooxml::LN_CT_Num_abstractNumId, pIdValue);
                     RTFValue::Pointer_t pNumberingValue(new RTFValue(aNumberingAttributes, aNumberingSprms));
                     aListTableSprms.set(NS_ooxml::LN_CT_Numbering_num, pNumberingValue, false);