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

[Miklos Vajna]

 writerfilter/source/doctok/DffImpl.cxx       |   36 +++------------------------
 writerfilter/source/doctok/resources.xmi     |    9 ------
 writerfilter/source/doctok/resources.xsl     |   36 ---------------------------
 writerfilter/source/doctok/resourcesimpl.xsl |   17 +-----------
 4 files changed, 6 insertions(+), 92 deletions(-)

New commits:
commit d8fbc8432da8db0b9ad364b917637a2432c58deb
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Nov 1 21:12:12 2013 +0100

    writerfilter: remove unused WW8FOPTE class in doctok
    
    Change-Id: I041983293690b5d5e090ba88df509c35cc8f6dc7

diff --git a/writerfilter/source/doctok/DffImpl.cxx b/writerfilter/source/doctok/DffImpl.cxx
index 546680f..86189e3 100644
--- a/writerfilter/source/doctok/DffImpl.cxx
+++ b/writerfilter/source/doctok/DffImpl.cxx
@@ -267,37 +267,14 @@ sal_uInt32 DffOPT::get_property_count()
 }
 
 writerfilter::Reference<Properties>::Pointer_t
-DffOPT::get_property(sal_uInt32 nPos)
+DffOPT::get_property(sal_uInt32 /*nPos*/)
 {
-    WW8FOPTE * pTmp = new WW8FOPTE(this, 0x8 + nPos * WW8FOPTE::getSize());
-    pTmp->setIndex(nPos);
-
-    return writerfilter::Reference<Properties>::Pointer_t(pTmp);
+    return writerfilter::Reference<Properties>::Pointer_t();
 }
 
-sal_uInt32 DffOPT::get_extraoffset(sal_uInt32 pos)
+sal_uInt32 DffOPT::get_extraoffset(sal_uInt32 /*pos*/)
 {
-    sal_uInt32 nResult;
-    sal_uInt32 nCount = get_property_count();
-
-    if (pos < nCount)
-    {
-        nResult = 0x8 + nCount * WW8FOPTE::getSize();
-
-        for (sal_uInt32 n = 0; n < pos; ++n)
-        {
-            WW8FOPTE aFOPTE(this, 0x8 + n * WW8FOPTE::getSize());
-
-            if (aFOPTE.get_fComplex())
-            {
-                sal_uInt32 nValue = aFOPTE.get_op();
-                nResult += nValue;
-            }
-        }
-    }
-    else
-        nResult = getCount();
-
+    sal_uInt32 nResult = 0;
     return nResult;
 }
 
@@ -337,11 +314,6 @@ DffBSE::get_blip()
     return pResult;
 }
 
-// WW8FOPTE
-void WW8FOPTE::resolveNoAuto(Properties &)
-{
-}
-
 // DffFSP
 
 OUString DffFSP::get_shptypename()
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index 40a694e..21f0060 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -26732,15 +26732,6 @@
         <!--Class Rectangle-->
         <!--Class FOPTE-->
         <UML:Class xmi.id="FOPTE" name="FOPTE">
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="ww8resource"/>
-          </UML:ModelElement.stereotype>
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="withindex"/>
-          </UML:ModelElement.stereotype>
-          <UML:ModelElement.stereotype>
-            <UML:Stereotype xmi.idref="resolvenoauto"/>
-          </UML:ModelElement.stereotype>
           <UML:ModelElement.taggedValue>
             <UML:TaggedValue>
               <UML:TaggedValue.dataValue>6</UML:TaggedValue.dataValue>
diff --git a/writerfilter/source/doctok/resources.xsl b/writerfilter/source/doctok/resources.xsl
index 11eaeb8..3c649fb 100644
--- a/writerfilter/source/doctok/resources.xsl
+++ b/writerfilter/source/doctok/resources.xsl
@@ -75,9 +75,6 @@ OUString getDffOptName(sal_uInt32 nPid);
       <xsl:when test='.//UML:Stereotype[@xmi.idref = "dffrecord"]'>
         <xsl:apply-templates select="." mode="dffrecord"/>
       </xsl:when>
-      <xsl:when test='.//UML:Stereotype[@xmi.idref = "dffopt"]'>
-        <xsl:apply-templates select="." mode="dffopt"/>
-      </xsl:when>
     </xsl:choose>
   </xsl:template>
 
@@ -793,39 +790,6 @@ public:
 </xsl:template>
 
 
-<xsl:template match="UML:Class" mode="dffopt">
-<!--
-  <xsl:variable name="classname">
-  <xsl:text>DffOpt</xsl:text><xsl:value-of select="@name"/>
-  </xsl:variable>
-  <xsl:text>
-/** 
-    Automaticallay generated class:
-  </xsl:text>
-  <xsl:value-of select="$classname"/>
-  <xsl:text>&#xa;
-*/&#xa;
-class </xsl:text>
-<xsl:value-of select="$classname"/>
-<xsl:text> : public WW8FOPTE
-{
-    </xsl:text>
-    <xsl:value-of select="$classname"/>
-    <xsl:text>(WW8FOPTE & rOpt) : WW8FOPTE(rOpt) {}
-
-    virtual string getName() const
-    {
-       return "</xsl:text>
-       <xsl:value-of select="@name"/>
-       <xsl:text>";
-     }&#xa;</xsl:text>
-
-     <xsl:text>
-};
-</xsl:text> 
--->
-</xsl:template>
-
 <xsl:template name="parenttype">
   <xsl:param name='type'/>
   <xsl:for-each select='/XMI/XMI.content/UML:Model/UML:Namespace.ownedElement/UML:Generalization[UML:Generalization.child/UML:Class/@xmi.idref=$type]'>
diff --git a/writerfilter/source/doctok/resourcesimpl.xsl b/writerfilter/source/doctok/resourcesimpl.xsl
index f54f3be..873f989 100644
--- a/writerfilter/source/doctok/resourcesimpl.xsl
+++ b/writerfilter/source/doctok/resourcesimpl.xsl
@@ -443,27 +443,14 @@ OUString getDffOptName(sal_uInt32)
 
 <xsl:template name="ww8foptegetvalue">
   <xsl:text>
-WW8Value::Pointer_t WW8FOPTE::get_value()
-{
-    WW8Value::Pointer_t pResult;
-    return pResult;
-}</xsl:text>
+</xsl:text>
 </xsl:template>
 
 <xsl:template match='UML:Model/UML:Namespace.ownedElement' mode='ww8foptename'>
   <xsl:text>
-OUString WW8FOPTE::get_name()
-{
-    return getDffOptName(get_pid());
-}</xsl:text>
+</xsl:text>
 <xsl:call-template name="getdffoptname"/>
 <xsl:text>
-
-WW8Value::Pointer_t WW8FOPTE::get_stringValue()
-{
-    WW8Value::Pointer_t pResult;
-    return pResult;
-}
 </xsl:text>
 <xsl:call-template name="ww8foptegetvalue"/>
 </xsl:template>