writerfilter: drop unused rtf:{ALTFONTNAME,XSZFFN,XSTZNAME,UPXSTART,UPX}

Change-Id: Ie4520c3ab722b639b055fc63bb76c060e6198a27

7 files changed, 1 insertions, 117 deletions

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index e9c1a8ebcc3e..242d4e7ef0e3 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -746,18 +746,8 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
             m_pImpl->AddBookmark( sLocalBookmarkName, sStringValue );
             sLocalBookmarkName = OUString();
         break;
-        case NS_rtf::LN_ALTFONTNAME:
-            break;
-        case NS_rtf::LN_XSZFFN:
-            break;
-        case NS_rtf::LN_XSTZNAME:
-            break;
         case NS_rtf::LN_XSTZNAME1:
             break;
-        case NS_rtf::LN_UPXSTART:
-            break;
-        case NS_rtf::LN_UPX:
-            break;
         case NS_rtf::LN_sed:
             //section properties
             resolveAttributeProperties(*this, val);
diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx
index bb1f8d723830..1739bd38eba5 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -89,10 +89,6 @@ void FontTable::lcl_attribute(Id Name, Value & val)
         case NS_rtf::LN_FS:
             m_pImpl->pCurrentEntry->sFontSignature += sValue;
         break;
-        case NS_rtf::LN_ALTFONTNAME:
-            m_pImpl->pCurrentEntry->sAlternativeFont = sValue;
-        break;
-        case NS_rtf::LN_XSZFFN:
         case NS_ooxml::LN_CT_Font_name:
             m_pImpl->pCurrentEntry->sFontName = sValue;
         break;
diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx
index 36dec44aa414..305dcbc28f9f 100644
--- a/writerfilter/source/dmapper/FontTable.hxx
+++ b/writerfilter/source/dmapper/FontTable.hxx
@@ -45,7 +45,6 @@ struct FontEntry
     sal_Int32       nAltFontIndex;
     OUString sPanose;
     OUString sFontSignature;
-    OUString sAlternativeFont;
     FontEntry() :
         bTrueType(false),
         nPitchRequest( 0 ),
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 666e10af60a9..97a1ade41e10 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -455,19 +455,11 @@ 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_XSTZNAME:
-            m_pImpl->m_pCurrentEntry->sStyleName1 = sValue;
-            if (!m_pImpl->m_pCurrentEntry->sStyleIdentifierI.isEmpty())
-                m_pImpl->m_pCurrentEntry->sStyleIdentifierI = sValue;
-        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_rtf::LN_UPX:
-            resolveAttributeProperties(val);
-        break;
         case NS_ooxml::LN_CT_Style_type:
         {
             SAL_WARN_IF( m_pImpl->m_pCurrentEntry->nStyleTypeCode != STYLE_TYPE_UNKNOWN,
@@ -1508,14 +1500,6 @@ OUString StyleSheetTable::GetStyleIdFromIndex(const sal_uInt32 sti)
     return sRet;
 }
 
-void StyleSheetTable::resolveAttributeProperties(Value & val)
-{
-    writerfilter::Reference<Properties>::Pointer_t pProperties = val.getProperties();
-    if( pProperties.get())
-        pProperties->resolve(*this);
-}
-
-
 void StyleSheetTable::applyDefaults(bool bParaProperties)
 {
     try{
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx
index 0c1699b10eb8..e9faba7fc023 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -117,7 +117,6 @@ private:
     // Table
     virtual void lcl_entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref);
 
-    void resolveAttributeProperties(Value & val);
     void applyDefaults(bool bParaProperties);
 };
 typedef boost::shared_ptr< StyleSheetTable >    StyleSheetTablePtr;
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index 6b9c024d6fec..07ace4bb4a27 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -2544,60 +2544,6 @@
             </UML:TaggedValue>
           </UML:ModelElement.taggedValue>
           <UML:Classifier.feature>
-            <UML:Operation name="altName">
-              <UML:ModelElement.taggedValue>
-                <UML:TaggedValue>
-                  <UML:TaggedValue.dataValue>rtf:ALTFONTNAME</UML:TaggedValue.dataValue>
-                  <UML:TaggedValue.type>
-                    <UML:TagDefinition xmi.idref="opid"/>
-                  </UML:TaggedValue.type>
-                </UML:TaggedValue>
-              </UML:ModelElement.taggedValue>
-              <UML:BehavioralFeature.parameter>
-                <UML:Parameter kind="return" name="return">
-                  <UML:Parameter.type>
-                    <UML:Class xmi.idref="String"/>
-                  </UML:Parameter.type>
-                </UML:Parameter>
-              </UML:BehavioralFeature.parameter>
-              <UML:ModelElement.stereotype>
-                <UML:Stereotype xmi.idref="attribute"/>
-              </UML:ModelElement.stereotype>
-            </UML:Operation>
-            <UML:Operation name="xszFfn">
-              <UML:ModelElement.taggedValue>
-                <UML:TaggedValue>
-                  <UML:TaggedValue.dataValue>rtf:XSZFFN</UML:TaggedValue.dataValue>
-                  <UML:TaggedValue.type>
-                    <UML:TagDefinition xmi.idref="opid"/>
-                  </UML:TaggedValue.type>
-                </UML:TaggedValue>
-              </UML:ModelElement.taggedValue>
-              <UML:BehavioralFeature.parameter>
-                <UML:Parameter kind="return" name="return">
-                  <UML:Parameter.type>
-                    <UML:Class xmi.idref="String"/>
-                  </UML:Parameter.type>
-                </UML:Parameter>
-              </UML:BehavioralFeature.parameter>
-              <UML:ModelElement.stereotype>
-                <UML:Stereotype xmi.idref="attribute"/>
-              </UML:ModelElement.stereotype>
-              <UML:ModelElement.taggedValue>
-                <UML:TaggedValue>
-                  <UML:TaggedValue.dataValue>zero terminated string that records name of font. Possibly
-                  followed by a second xsz which records the name of an alternate
-                  font to use if the first named font does not exist on this system.
-                  Maximal size of xszFfn is 65 characters.</UML:TaggedValue.dataValue>
-                  <UML:TaggedValue.type>
-                    <UML:TagDefinition xmi.idref="comment"/>
-                  </UML:TaggedValue.type>
-                </UML:TaggedValue>
-              </UML:ModelElement.taggedValue>
-              <UML:ModelElement.stereotype>
-                <UML:Stereotype xmi.idref="attribute"/>
-              </UML:ModelElement.stereotype>
-            </UML:Operation>
             <UML:Attribute name="cbFfnM1">
               <UML:ModelElement.taggedValue>
                 <UML:TaggedValue>
@@ -3420,16 +3366,6 @@
             </UML:Attribute>
           </UML:Classifier.feature>
           <UML:Classifier.feature>
-            <UML:Operation name="xstzName">
-              <UML:ModelElement.taggedValue>
-                <UML:TaggedValue>
-                  <UML:TaggedValue.dataValue>rtf:XSTZNAME</UML:TaggedValue.dataValue>
-                  <UML:TaggedValue.type>
-                    <UML:TagDefinition xmi.idref="opid"/>
-                  </UML:TaggedValue.type>
-                </UML:TaggedValue>
-              </UML:ModelElement.taggedValue>
-            </UML:Operation>
             <UML:Operation name="xstzName1">
               <UML:ModelElement.taggedValue>
                 <UML:TaggedValue>
@@ -3440,26 +3376,6 @@
                 </UML:TaggedValue>
               </UML:ModelElement.taggedValue>
             </UML:Operation>
-            <UML:Operation name="upxstart">
-              <UML:ModelElement.taggedValue>
-                <UML:TaggedValue>
-                  <UML:TaggedValue.dataValue>rtf:UPXSTART</UML:TaggedValue.dataValue>
-                  <UML:TaggedValue.type>
-                    <UML:TagDefinition xmi.idref="opid"/>
-                  </UML:TaggedValue.type>
-                </UML:TaggedValue>
-              </UML:ModelElement.taggedValue>
-            </UML:Operation>
-            <UML:Operation name="upx">
-              <UML:ModelElement.taggedValue>
-                <UML:TaggedValue>
-                  <UML:TaggedValue.dataValue>rtf:UPX</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-->
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 3b45b939f2ba..c229edc3fa57 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1036,7 +1036,7 @@ void RTFDocumentImpl::text(OUString& rString)
                         case DESTINATION_FONTENTRY:
                             {
                                 RTFValue::Pointer_t pValue(new RTFValue(m_aStates.top().aDestinationText.makeStringAndClear()));
-                                m_aStates.top().aTableAttributes.set(NS_rtf::LN_XSZFFN, pValue);
+                                m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_Font_name, pValue);
 
                                 writerfilter::Reference<Properties>::Pointer_t const pProp(
                                         new RTFReferenceProperties(m_aStates.top().aTableAttributes, m_aStates.top().aTableSprms)