writerfilter: convert sprm:CF{Bold,BoldBi,Italic,ItalicBi}

Change-Id: Ide2116ac380fd563fa7cc9e60f46a7cc62ffc94b

4 files changed, 27 insertions, 157 deletions

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 9aa4a856171f..ea39f2c637f7 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1308,12 +1308,10 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
         rContext->Insert(PROP_CHAR_EMPHASIS, uno::makeAny ( getEmphasisValue (nIntValue)));
         break;  // sprmCKcd
     case NS_sprm::LN_CFEmboss:// sprmCFEmboss
-    case 60:// sprmCFBold
-    case NS_sprm::LN_CFBoldBi:// sprmCFBoldBi    (offset 0x27 to normal bold)
-    case NS_sprm::LN_CFItalicBi:// sprmCFItalicBi  (offset 0x27 to normal italic)
-    case NS_sprm::LN_CFBold: //sprmCFBold
-    case 61: /*sprmCFItalic*/
-    case NS_sprm::LN_CFItalic: //sprmCFItalic
+    case NS_ooxml::LN_EG_RPrBase_b:
+    case NS_ooxml::LN_EG_RPrBase_bCs:
+    case NS_ooxml::LN_EG_RPrBase_i:
+    case NS_ooxml::LN_EG_RPrBase_iCs:
     case NS_sprm::LN_CFStrike: //sprmCFStrike
     case NS_sprm::LN_CFOutline: //sprmCFOutline
     case NS_sprm::LN_CFShadow: //sprmCFShadow
@@ -1325,15 +1323,13 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
             PropertyIds ePropertyId = PROP_CHAR_WEIGHT; //initialized to prevent warning!
             switch( nSprmId )
             {
-            case 60:// sprmCFBold
-            case NS_sprm::LN_CFBoldBi: // sprmCFBoldBi
-            case NS_sprm::LN_CFBold: /*sprmCFBold*/
-                ePropertyId = nSprmId != NS_sprm::LN_CFBoldBi ? PROP_CHAR_WEIGHT : PROP_CHAR_WEIGHT_COMPLEX;
+            case NS_ooxml::LN_EG_RPrBase_b:
+            case NS_ooxml::LN_EG_RPrBase_bCs:
+                ePropertyId = nSprmId != NS_ooxml::LN_EG_RPrBase_bCs ? PROP_CHAR_WEIGHT : PROP_CHAR_WEIGHT_COMPLEX;
                 break;
-            case 61: /*sprmCFItalic*/
-            case NS_sprm::LN_CFItalicBi: // sprmCFItalicBi
-            case NS_sprm::LN_CFItalic: /*sprmCFItalic*/
-                ePropertyId = nSprmId == 0x836 ? PROP_CHAR_POSTURE : PROP_CHAR_POSTURE_COMPLEX;
+            case NS_ooxml::LN_EG_RPrBase_i:
+            case NS_ooxml::LN_EG_RPrBase_iCs:
+                ePropertyId = nSprmId == NS_ooxml::LN_EG_RPrBase_i ? PROP_CHAR_POSTURE : PROP_CHAR_POSTURE_COMPLEX;
                 break;
             case NS_sprm::LN_CFStrike: /*sprmCFStrike*/
             case NS_sprm::LN_CFDStrike : /*sprmCFDStrike double strike through*/
@@ -1391,34 +1387,32 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
 
                 switch( nSprmId )
                 {
-                    case 60:/*sprmCFBold*/
-                    case NS_sprm::LN_CFBold: /*sprmCFBold*/
-                    case NS_sprm::LN_CFBoldBi: // sprmCFBoldBi
+                    case NS_ooxml::LN_EG_RPrBase_b:
+                    case NS_ooxml::LN_EG_RPrBase_bCs:
                     {
                         uno::Any aBold( uno::makeAny( nIntValue ? awt::FontWeight::BOLD : awt::FontWeight::NORMAL ) );
 
                         rContext->Insert(ePropertyId, aBold );
-                        if( nSprmId != NS_sprm::LN_CFBoldBi ) // sprmCFBoldBi
+                        if( nSprmId != NS_ooxml::LN_EG_RPrBase_bCs )
                             rContext->Insert(PROP_CHAR_WEIGHT_ASIAN, aBold );
 
                         uno::Reference<beans::XPropertySet> xCharStyle(m_pImpl->GetCurrentNumberingCharStyle());
                         if (xCharStyle.is())
                             xCharStyle->setPropertyValue(rPropNameSupplier.GetName(PROP_CHAR_WEIGHT), aBold);
-                        if (nSprmId == NS_sprm::LN_CFBold)
+                        if (nSprmId == NS_ooxml::LN_EG_RPrBase_b)
                             m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "b", OUString::number(nIntValue));
-                        else if (nSprmId == NS_sprm::LN_CFBoldBi)
+                        else if (nSprmId == NS_ooxml::LN_EG_RPrBase_bCs)
                             m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "bCs", OUString::number(nIntValue));
                     }
                     break;
-                    case 61: /*sprmCFItalic*/
-                    case NS_sprm::LN_CFItalic: /*sprmCFItalic*/
-                    case NS_sprm::LN_CFItalicBi: // sprmCFItalicBi
+                    case NS_ooxml::LN_EG_RPrBase_i:
+                    case NS_ooxml::LN_EG_RPrBase_iCs:
                     {
                         uno::Any aPosture( uno::makeAny( nIntValue ? awt::FontSlant_ITALIC : awt::FontSlant_NONE ) );
                         rContext->Insert( ePropertyId, aPosture );
-                        if( nSprmId != NS_sprm::LN_CFItalicBi ) // sprmCFItalicBi
+                        if (nSprmId != NS_ooxml::LN_EG_RPrBase_iCs)
                             rContext->Insert(PROP_CHAR_POSTURE_ASIAN, aPosture );
-                        if (nSprmId == NS_sprm::LN_CFItalic)
+                        if (nSprmId == NS_ooxml::LN_EG_RPrBase_i)
                             m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, "i", OUString::number(nIntValue));
                     }
                     break;
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index f7096fae846e..0d04b5193102 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -286,68 +286,6 @@
           </UML:ModelElement.taggedValue>
         </UML:Class>
         <!--SPRM sprmCKcd-->
-        <!--SPRM sprmCFBold-->
-        <UML:Class xmi.id="sprmCFBold" name="sprmCFBold">
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="ww8sprm"/>
-          </UML:ModelElement.stereotype>
-          <UML:ModelElement.taggedValue>
-            <UML:TaggedValue>
-              <UML:TaggedValue.dataValue>0x0835</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:sprmCFBold</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 sprmCFBold-->
-        <!--SPRM sprmCFItalic-->
-        <UML:Class xmi.id="sprmCFItalic" name="sprmCFItalic">
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="ww8sprm"/>
-          </UML:ModelElement.stereotype>
-          <UML:ModelElement.taggedValue>
-            <UML:TaggedValue>
-              <UML:TaggedValue.dataValue>0x0836</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:sprmCFItalic</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 sprmCFItalic-->
         <!--SPRM sprmCFStrike-->
         <UML:Class xmi.id="sprmCFStrike" name="sprmCFStrike">
           <UML:ModelElement.stereotype>
@@ -1123,68 +1061,6 @@
           </UML:ModelElement.taggedValue>
         </UML:Class>
         <!--SPRM sprmCFBiDi-->
-        <!--SPRM sprmCFBoldBi-->
-        <UML:Class xmi.id="sprmCFBoldBi" name="sprmCFBoldBi">
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="ww8sprm"/>
-          </UML:ModelElement.stereotype>
-          <UML:ModelElement.taggedValue>
-            <UML:TaggedValue>
-              <UML:TaggedValue.dataValue>0x085C</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:sprmCFBoldBi</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 sprmCFBoldBi-->
-        <!--SPRM sprmCFItalicBi-->
-        <UML:Class xmi.id="sprmCFItalicBi" name="sprmCFItalicBi">
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="ww8sprm"/>
-          </UML:ModelElement.stereotype>
-          <UML:ModelElement.taggedValue>
-            <UML:TaggedValue>
-              <UML:TaggedValue.dataValue>0x085D</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:sprmCFItalicBi</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 sprmCFItalicBi-->
         <!--SPRM sprmCLidBi-->
         <UML:Class xmi.id="sprmCLidBi" name="sprmCLidBi">
           <UML:ModelElement.stereotype>
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 75ad524fb005..bab57047f760 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -23112,10 +23112,10 @@
       <kind name="paragraph"/>
       <element name="rStyle" tokenid="ooxml:EG_RPrBase_rStyle"/>
       <element name="rFonts" tokenid="ooxml:EG_RPrBase_rFonts"/>
-      <element name="b" tokenid="sprm:CFBold"/>
-      <element name="bCs" tokenid="sprm:CFBoldBi"/>
-      <element name="i" tokenid="sprm:CFItalic"/>
-      <element name="iCs" tokenid="sprm:CFItalicBi"/>
+      <element name="b" tokenid="ooxml:EG_RPrBase_b"/>
+      <element name="bCs" tokenid="ooxml:EG_RPrBase_bCs"/>
+      <element name="i" tokenid="ooxml:EG_RPrBase_i"/>
+      <element name="iCs" tokenid="ooxml:EG_RPrBase_iCs"/>
       <element name="caps" tokenid="sprm:CFCaps"/>
       <element name="smallCaps" tokenid="sprm:CFSmallCaps"/>
       <element name="strike" tokenid="sprm:CFStrike"/>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index d87ddc209425..36dfc5a15261 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3841,10 +3841,10 @@ int RTFDocumentImpl::dispatchToggle(RTFKeyword nKeyword, bool bParam, int nParam
     // Trivial character sprms.
     switch (nKeyword)
     {
-        case RTF_B: nSprm = NS_sprm::LN_CFBold; break;
-        case RTF_AB: nSprm = NS_sprm::LN_CFBoldBi; break;
-        case RTF_I: nSprm = NS_sprm::LN_CFItalic; break;
-        case RTF_AI: nSprm = NS_sprm::LN_CFItalicBi; break;
+        case RTF_B: nSprm = NS_ooxml::LN_EG_RPrBase_b; break;
+        case RTF_AB: nSprm = NS_ooxml::LN_EG_RPrBase_bCs; break;
+        case RTF_I: nSprm = NS_ooxml::LN_EG_RPrBase_i; break;
+        case RTF_AI: nSprm = NS_ooxml::LN_EG_RPrBase_iCs; break;
         case RTF_UL: nSprm = NS_sprm::LN_CKul; break;
         case RTF_OUTL: nSprm = NS_sprm::LN_CFOutline; break;
         case RTF_SHAD: nSprm = NS_sprm::LN_CFShadow; break;