[Libreoffice-commits] core.git: writerfilter/source

[Miklos Vajna]

 writerfilter/source/dmapper/DomainMapper.cxx |    2 -
 writerfilter/source/doctok/resources.xmi     |   31 ---------------------------
 writerfilter/source/ooxml/model.xml          |    2 -
 3 files changed, 2 insertions(+), 33 deletions(-)

New commits:
commit 8978f494e8ef0cb3faebd200f982e3b6db267118
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Feb 24 22:08:19 2014 +0100

    writerfilter: sprm:CFNoProof -> ooxml:EG_RPrBase_noProof
    
    Change-Id: I4a4c05554c336aca8407f4b22fc581659dcaeb88

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 68731b5..f110e83 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2089,7 +2089,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
         }
     }
     break;
-    case NS_sprm::LN_CFNoProof: //0x875 no grammar and spell checking, unsupported
+    case NS_ooxml::LN_EG_RPrBase_noProof: // no grammar and spell checking, unsupported
     break;
     case NS_ooxml::LN_anchor_anchor: // at_character drawing
     case NS_ooxml::LN_inline_inline: // as_character drawing
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index e013410..9d6a187 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -658,37 +658,6 @@
           </UML:ModelElement.taggedValue>
         </UML:Class>
         <!--SPRM sprmCCharScale-->
-        <!--SPRM sprmCFNoProof-->
-        <UML:Class xmi.id="sprmCFNoProof" name="sprmCFNoProof">
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="ww8sprm"/>
-          </UML:ModelElement.stereotype>
-          <UML:ModelElement.taggedValue>
-            <UML:TaggedValue>
-              <UML:TaggedValue.dataValue>0x0875</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:sprmCFNoProof</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 sprmCFNoProof-->
         <!--SPRM sprmCFspecVanish-->
         <UML:Class xmi.id="sprmCFspecVanish" name="sprmCFspecVanish">
           <UML:ModelElement.stereotype>
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 73d90d8..8612d6b 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -23482,7 +23482,7 @@
       <element name="shadow" tokenid="ooxml:EG_RPrBase_shadow"/>
       <element name="emboss" tokenid="ooxml:EG_RPrBase_emboss"/>
       <element name="imprint" tokenid="ooxml:EG_RPrBase_imprint"/>
-      <element name="noProof" tokenid="sprm:CFNoProof"/>
+      <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"/>