writerfilter: sprm:PBrc{Between,Bar} -> ooxml:CT_PBdr_{between,bar}

Change-Id: I9ed3f3beafc8b3dd340b39ed24c5eb8315c19a2f

3 files changed, 7 insertions, 69 deletions

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 904cd4087c40..17d5d49c24d9 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1103,7 +1103,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
     case NS_ooxml::LN_CT_PBdr_left:
     case NS_ooxml::LN_CT_PBdr_bottom:
     case NS_ooxml::LN_CT_PBdr_right:
-    case NS_sprm::LN_PBrcBetween:   // sprmPBrcBetween
+    case NS_ooxml::LN_CT_PBdr_between:
         {
             //in binary format the borders are directly provided in OOXML they are inside of properties
             if( IsOOXMLImport() || IsRTFImport() )
@@ -1133,7 +1133,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
                             eBorderId = PROP_RIGHT_BORDER;
                             eBorderDistId = PROP_RIGHT_BORDER_DISTANCE ;
                         break;
-                        case NS_sprm::LN_PBrcBetween:
+                        case NS_ooxml::LN_CT_PBdr_between:
                             //not supported
                         break;
                         default:;
@@ -1157,7 +1157,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
                 PropertyIds eBorderDistId = PROP_LEFT_BORDER_DISTANCE  ;
                 switch( nSprmId )
                 {
-                case NS_sprm::LN_PBrcBetween:   // sprmPBrcBetween
+                case NS_ooxml::LN_CT_PBdr_between:
                     OSL_FAIL( "TODO: inner border is not handled");
                     break;
                 case NS_ooxml::LN_CT_PBdr_left:
@@ -1182,8 +1182,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
             }
         }
     break;
-    case NS_sprm::LN_PBrcBar:
-        break;  // sprmPBrcBar
+    case NS_ooxml::LN_CT_PBdr_bar:
+        break;
     case NS_sprm::LN_PFNoAutoHyph:   // sprmPFNoAutoHyph
         rContext->Insert(PROP_PARA_IS_HYPHENATION, uno::makeAny( nIntValue ? false : true ));
         break;
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index 8fa5eecca68e..8f05029386ab 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -379,45 +379,6 @@
           </UML:ModelElement.taggedValue>
         </UML:Class>
         <!--SPRM sprmPRow-->
-        <!--SPRM sprmPBrcBar-->
-        <UML:Class xmi.id="sprmPBrcBar" name="sprmPBrcBar">
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="ww8sprm"/>
-          </UML:ModelElement.stereotype>
-          <UML:ModelElement.taggedValue>
-            <UML:TaggedValue>
-              <UML:TaggedValue.dataValue>0x6629</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:sprmPBrcBar</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>
-        <UML:Generalization isSpecification="false" xmi.id="sprmPBrcBar-Properties">
-          <UML:Generalization.child>
-            <UML:Class xmi.idref="sprmPBrcBar"/>
-          </UML:Generalization.child>
-          <UML:Generalization.parent>
-            <UML:Class xmi.idref="Properties"/>
-          </UML:Generalization.parent>
-        </UML:Generalization>
-        <!--SPRM sprmPBrcBar-->
         <!--SPRM sprmPFNoAutoHyph-->
         <UML:Class xmi.id="sprmPFNoAutoHyph" name="sprmPFNoAutoHyph">
           <UML:ModelElement.stereotype>
@@ -1968,29 +1929,6 @@
           </UML:ModelElement.taggedValue>
         </UML:Class>
         <!--SPRM sprmPTableDepth-->
-        <!--SPRM sprmPBrcBetween-->
-        <UML:Class xmi.id="sprmPBrcBetween" name="sprmPBrcBetween">
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="ww8sprm"/>
-          </UML:ModelElement.stereotype>
-          <UML:ModelElement.taggedValue>
-            <UML:TaggedValue>
-              <UML:TaggedValue.dataValue>0x6428</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:sprmPBrcBetween</UML:TaggedValue.dataValue>
-              <UML:TaggedValue.type>
-                <UML:TagDefinition xmi.idref="sprmid"/>
-              </UML:TaggedValue.type>
-            </UML:TaggedValue>
-          </UML:ModelElement.taggedValue>
-        </UML:Class>
-        <!--SPRM sprmPBrcBetween-->
         <!--SPRM sprmPDxaLeft1-->
         <UML:Class xmi.id="sprmPDxaLeft1" name="sprmPDxaLeft1">
           <UML:ModelElement.stereotype>
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index ab0476ad7f48..87dc6c9b24a5 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -22318,8 +22318,8 @@
       <element name="left" tokenid="ooxml:CT_PBdr_left"/>
       <element name="bottom" tokenid="ooxml:CT_PBdr_bottom"/>
       <element name="right" tokenid="ooxml:CT_PBdr_right"/>
-      <element name="between" tokenid="sprm:PBrcBetween"/>
-      <element name="bar" tokenid="sprm:PBrcBar"/>
+      <element name="between" tokenid="ooxml:CT_PBdr_between"/>
+      <element name="bar" tokenid="ooxml:CT_PBdr_bar"/>
     </resource>
     <resource name="CT_Tabs" resource="Properties" tag="paragraph">
       <element name="tab" tokenid="ooxml:CT_Tabs_tab"/>