writerfilter: sprm:P{Wr,FLocked} -> ooxml:CT_FramePr_{wrap,anchorLock}

Change-Id: I7d73e3d6e2b56e39b2e098fa81827886dec7e2e8

4 files changed, 13 insertions, 75 deletions

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 0d30a7993559..4e81336bd4c1 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -617,7 +617,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
         case NS_ooxml::LN_CT_FramePr_hRule:
         case NS_ooxml::LN_CT_FramePr_w:
         case NS_ooxml::LN_CT_FramePr_h:
-        case NS_sprm::LN_PWr:
+        case NS_ooxml::LN_CT_FramePr_wrap:
         case NS_ooxml::LN_CT_FramePr_hSpace:
         case NS_ooxml::LN_CT_FramePr_vSpace:
         {
@@ -720,7 +720,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
                          }
                         pParaProperties->SethRule( nIntValue );
                     break;
-                    case NS_sprm::LN_PWr:
+                    case NS_ooxml::LN_CT_FramePr_wrap:
                     {
                         //should be either LN_Value_wordprocessingml_ST_Wrap_notBeside or LN_Value_wordprocessingml_ST_Wrap_around
                         OSL_ENSURE( sal::static_int_cast<Id>(nIntValue) == NS_ooxml::LN_Value_wordprocessingml_ST_Wrap_around ||
@@ -1085,8 +1085,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
     break;
     case NS_ooxml::LN_CT_FramePr_w:
         break;
-    case NS_sprm::LN_PWr:
-        break;  // sprmPWr
+    case NS_ooxml::LN_CT_FramePr_wrap:
+        break;
 
     case NS_ooxml::LN_CT_PrBase_pBdr: //paragraph border
         resolveSprmProps(*this, rSprm);
@@ -1206,8 +1206,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
         break;  // sprmPDyaFromText
     case NS_ooxml::LN_CT_FramePr_hSpace:
         break;  // sprmPDxaFromText
-    case NS_sprm::LN_PFLocked:
-        break;  // sprmPFLocked
+    case NS_ooxml::LN_CT_FramePr_anchorLock:
+        break;
     case NS_sprm::LN_PFWidowControl:
     case NS_ooxml::LN_CT_PPrBase_widowControl:
     {
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index d9dc166dac63..7369806bfc91 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -441,37 +441,6 @@
           </UML:ModelElement.taggedValue>
         </UML:Class>
         <!--SPRM sprmPRow-->
-        <!--SPRM sprmPWr-->
-        <UML:Class xmi.id="sprmPWr" name="sprmPWr">
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="ww8sprm"/>
-          </UML:ModelElement.stereotype>
-          <UML:ModelElement.taggedValue>
-            <UML:TaggedValue>
-              <UML:TaggedValue.dataValue>0x2423</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:sprmPWr</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>paragraph</UML:TaggedValue.dataValue>
-              <UML:TaggedValue.type>
-                <UML:TagDefinition xmi.idref="kind"/>
-              </UML:TaggedValue.type>
-            </UML:TaggedValue>
-          </UML:ModelElement.taggedValue>
-        </UML:Class>
-        <!--SPRM sprmPWr-->
         <!--SPRM sprmPBrcBar-->
         <UML:Class xmi.id="sprmPBrcBar" name="sprmPBrcBar">
           <UML:ModelElement.stereotype>
@@ -573,37 +542,6 @@
           </UML:ModelElement.taggedValue>
         </UML:Class>
         <!--SPRM sprmPShd-->
-        <!--SPRM sprmPFLocked-->
-        <UML:Class xmi.id="sprmPFLocked" name="sprmPFLocked">
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="ww8sprm"/>
-          </UML:ModelElement.stereotype>
-          <UML:ModelElement.taggedValue>
-            <UML:TaggedValue>
-              <UML:TaggedValue.dataValue>0x2430</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:sprmPFLocked</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>paragraph</UML:TaggedValue.dataValue>
-              <UML:TaggedValue.type>
-                <UML:TagDefinition xmi.idref="kind"/>
-              </UML:TaggedValue.type>
-            </UML:TaggedValue>
-          </UML:ModelElement.taggedValue>
-        </UML:Class>
-        <!--SPRM sprmPFLocked-->
         <!--SPRM sprmPFWidowControl-->
         <UML:Class xmi.id="sprmPFWidowControl" name="sprmPFWidowControl">
           <UML:ModelElement.stereotype>
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 31b97e2d82a2..562a6d82084b 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -21958,7 +21958,7 @@
       <attribute name="h" tokenid="ooxml:CT_FramePr_h"/>
       <attribute name="vSpace" tokenid="ooxml:CT_FramePr_vSpace"/>
       <attribute name="hSpace" tokenid="ooxml:CT_FramePr_hSpace"/>
-      <attribute name="wrap" tokenid="sprm:PWr"/>
+      <attribute name="wrap" tokenid="ooxml:CT_FramePr_wrap"/>
       <attribute name="hAnchor" tokenid="ooxml:CT_FramePr_hAnchor"/>
       <attribute name="vAnchor" tokenid="ooxml:CT_FramePr_vAnchor"/>
       <attribute name="x" tokenid="ooxml:CT_FramePr_x"/>
@@ -21966,7 +21966,7 @@
       <attribute name="y" tokenid="ooxml:CT_FramePr_y"/>
       <attribute name="yAlign" tokenid="ooxml:CT_FramePr_yAlign"/>
       <attribute name="hRule" tokenid="ooxml:CT_FramePr_hRule"/>
-      <attribute name="anchorLock" tokenid="sprm:PFLocked"/>
+      <attribute name="anchorLock" tokenid="ooxml:CT_FramePr_anchorLock"/>
     </resource>
     <resource name="ST_TabJc" resource="List">
       <value tokenid="ooxml:Value_ST_TabJc_clear">clear</value>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 9eea3d42e3ce..5773981387c8 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2774,7 +2774,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
                     m_aStates.top().aDrawingObject.xPropertySet->setPropertyValue("CornerRadius", uno::makeAny(sal_Int32(83)));
                 break;
         case RTF_NOWRAP:
-                m_aStates.top().aFrame.setSprm(NS_sprm::LN_PWr, NS_ooxml::LN_Value_wordprocessingml_ST_Wrap_notBeside);
+                m_aStates.top().aFrame.setSprm(NS_ooxml::LN_CT_FramePr_wrap, NS_ooxml::LN_Value_wordprocessingml_ST_Wrap_notBeside);
                 break;
         case RTF_MNOR:
                 m_bMathNor = true;
@@ -5123,8 +5123,8 @@ void RTFFrame::setSprm(Id nId, Id nValue)
         case NS_ooxml::LN_CT_FramePr_vAnchor:
             nVertAnchor = nValue;
             break;
-        case NS_sprm::LN_PWr:
-            oWrap.reset(nValue);
+        case NS_ooxml::LN_CT_FramePr_wrap:
+            oWrap = nValue;
             break;
         default:
             break;
@@ -5148,7 +5148,7 @@ RTFSprms RTFFrame::getSprms()
         NS_ooxml::LN_CT_FramePr_vAnchor,
         NS_ooxml::LN_CT_FramePr_xAlign,
         NS_ooxml::LN_CT_FramePr_yAlign,
-        NS_sprm::LN_PWr,
+        NS_ooxml::LN_CT_FramePr_wrap,
         NS_ooxml::LN_CT_FramePr_dropCap,
         NS_ooxml::LN_CT_FramePr_lines
     };
@@ -5218,7 +5218,7 @@ RTFSprms RTFFrame::getSprms()
                     pValue.reset(new RTFValue(nHRule));
                 }
                 break;
-            case NS_sprm::LN_PWr:
+            case NS_ooxml::LN_CT_FramePr_wrap:
                 if (oWrap)
                     pValue.reset(new RTFValue(*oWrap));
                 break;