writerfilter: sprm:CFVanish -> ooxml:EG_RPrBase_{vanish,webHidden}

Change-Id: I17a6e7717db331feb2e461bb53e0131012ab0066

4 files changed, 9 insertions, 37 deletions

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 87c87619c866..cc4eec7dc6e4 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1321,7 +1321,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
     case NS_ooxml::LN_EG_RPrBase_shadow:
     case NS_ooxml::LN_EG_RPrBase_caps:
     case NS_ooxml::LN_EG_RPrBase_smallCaps:
-    case NS_sprm::LN_CFVanish: //sprmCFVanish
+    case NS_ooxml::LN_EG_RPrBase_vanish:
+    case NS_ooxml::LN_EG_RPrBase_webHidden:
         {
             PropertyIds ePropertyId = PROP_CHAR_WEIGHT; //initialized to prevent warning!
             switch( nSprmId )
@@ -1348,7 +1349,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
             case NS_ooxml::LN_EG_RPrBase_smallCaps:
                 ePropertyId = PROP_CHAR_CASE_MAP;
                 break;
-            case NS_sprm::LN_CFVanish: /*sprmCFVanish*/
+            case NS_ooxml::LN_EG_RPrBase_vanish:
+            case NS_ooxml::LN_EG_RPrBase_webHidden:
                 ePropertyId = PROP_CHAR_HIDDEN;
                 break;
             case NS_ooxml::LN_EG_RPrBase_emboss:
@@ -1429,7 +1431,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
                     break;
                     case NS_ooxml::LN_EG_RPrBase_outline:
                     case NS_ooxml::LN_EG_RPrBase_shadow:
-                    case NS_sprm::LN_CFVanish: /*sprmCFVanish*/
+                    case NS_ooxml::LN_EG_RPrBase_vanish:
+                    case NS_ooxml::LN_EG_RPrBase_webHidden:
                         rContext->Insert(ePropertyId, uno::makeAny( nIntValue ? true : false ));
                     break;
                     case NS_ooxml::LN_EG_RPrBase_smallCaps:
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index 9d6a187c1f2e..7193b43bbd90 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -286,37 +286,6 @@
           </UML:ModelElement.taggedValue>
         </UML:Class>
         <!--SPRM sprmCKcd-->
-        <!--SPRM sprmCFVanish-->
-        <UML:Class xmi.id="sprmCFVanish" name="sprmCFVanish">
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="ww8sprm"/>
-          </UML:ModelElement.stereotype>
-          <UML:ModelElement.taggedValue>
-            <UML:TaggedValue>
-              <UML:TaggedValue.dataValue>0x083C</UML:TaggedValue.dataValue>
-              <UML:TaggedValue.type>
-                <UML:TagDefinition xmi.idref="sprmcode"/>
-              </UML:TaggedValue.type>
-            </UML:TaggedValue>
-          </UML:ModelElement.taggedValue>
-          <UML:ModelElement.taggedValue>
-            <UML:TaggedValue>
-              <UML:TaggedValue.dataValue>rtf:sprmCFVanish</UML:TaggedValue.dataValue>
-              <UML:TaggedValue.type>
-                <UML:TagDefinition xmi.idref="sprmid"/>
-              </UML:TaggedValue.type>
-            </UML:TaggedValue>
-          </UML:ModelElement.taggedValue>
-          <UML:ModelElement.taggedValue>
-            <UML:TaggedValue>
-              <UML:TaggedValue.dataValue>character</UML:TaggedValue.dataValue>
-              <UML:TaggedValue.type>
-                <UML:TagDefinition xmi.idref="kind"/>
-              </UML:TaggedValue.type>
-            </UML:TaggedValue>
-          </UML:ModelElement.taggedValue>
-        </UML:Class>
-        <!--SPRM sprmCFVanish-->
         <!--SPRM sprmCKul-->
         <UML:Class xmi.id="sprmCKul" name="sprmCKul">
           <UML:ModelElement.stereotype>
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index e7ed883e55e6..cb0c8050c871 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -23807,8 +23807,8 @@
       <element name="imprint" tokenid="ooxml:EG_RPrBase_imprint"/>
       <element name="noProof" tokenid="ooxml:EG_RPrBase_noProof"/>
       <element name="snapToGrid" tokenid="ooxml:EG_RPrBase_snapToGrid"/>
-      <element name="vanish" tokenid="sprm:CFVanish"/>
-      <element name="webHidden" tokenid="sprm:CFVanish"/>
+      <element name="vanish" tokenid="ooxml:EG_RPrBase_vanish"/>
+      <element name="webHidden" tokenid="ooxml:EG_RPrBase_webHidden"/>
       <element name="color" tokenid="ooxml:EG_RPrBase_color"/>
       <element name="spacing" tokenid="sprm:CDxaSpace"/>
       <element name="w" tokenid="sprm:CCharScale"/>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 1672c20480e8..3ef54c901e9b 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3994,7 +3994,7 @@ int RTFDocumentImpl::dispatchToggle(RTFKeyword nKeyword, bool bParam, int nParam
         case RTF_UL: nSprm = NS_sprm::LN_CKul; break;
         case RTF_OUTL: nSprm = NS_ooxml::LN_EG_RPrBase_outline; break;
         case RTF_SHAD: nSprm = NS_ooxml::LN_EG_RPrBase_shadow; break;
-        case RTF_V: nSprm = NS_sprm::LN_CFVanish; break;
+        case RTF_V: nSprm = NS_ooxml::LN_EG_RPrBase_vanish; break;
         case RTF_STRIKE: nSprm = NS_ooxml::LN_EG_RPrBase_strike; break;
         case RTF_STRIKED: nSprm = NS_ooxml::LN_EG_RPrBase_dstrike; break;
         case RTF_SCAPS: nSprm = NS_ooxml::LN_EG_RPrBase_smallCaps; break;