[Libreoffice-commits] core.git: writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Sat Nov 9 19:26:57 CET 2013
writerfilter/source/doctok/Dff.cxx | 12 ---
writerfilter/source/doctok/DffImpl.cxx | 98 ---------------------------
writerfilter/source/doctok/resources.xmi | 30 --------
writerfilter/source/doctok/resources.xsl | 60 ----------------
writerfilter/source/doctok/resourcesimpl.xsl | 9 --
writerfilter/source/doctok/tidyxmi.xsl | 11 ---
6 files changed, 1 insertion(+), 219 deletions(-)
New commits:
commit 1a1bb14acf6e2f38891e143e55ee5ac4909468a8
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sat Nov 9 19:21:02 2013 +0100
writerfilter: remove unused Dff{FSP,DGG,BSE,FSP,SpContainer,UDefProp} classes
Change-Id: Ie3c8f7ea546418a1de1113a54292fd31c64a1f7b
diff --git a/writerfilter/source/doctok/Dff.cxx b/writerfilter/source/doctok/Dff.cxx
index 1c71787..10b6dd1 100644
--- a/writerfilter/source/doctok/Dff.cxx
+++ b/writerfilter/source/doctok/Dff.cxx
@@ -174,12 +174,6 @@ sal_uInt32 DffRecord::getShapeType()
Records_t aRecords = findRecords(0xf00a);
- if (!aRecords.empty())
- {
- DffFSP * pDffFSP = dynamic_cast<DffFSP*>((*aRecords.begin()).get());
- nResult = pDffFSP->get_shptype();
- }
-
return nResult;
}
@@ -189,12 +183,6 @@ sal_uInt32 DffRecord::getShapeId()
Records_t aRecords = findRecords(0xf00a);
- if (!aRecords.empty())
- {
- DffFSP * pDffFSP = dynamic_cast<DffFSP*>((*aRecords.begin()).get());
- nResult = pDffFSP->get_shpid();
- }
-
return nResult;
}
diff --git a/writerfilter/source/doctok/DffImpl.cxx b/writerfilter/source/doctok/DffImpl.cxx
index e0cbc5e..2c14d3e 100644
--- a/writerfilter/source/doctok/DffImpl.cxx
+++ b/writerfilter/source/doctok/DffImpl.cxx
@@ -259,104 +259,6 @@ ShapeTypeToString::ShapeTypeToString()
mMap[202]="TextBox";
}
-//DffDGG
-
-sal_uInt32 DffDGG::get_fidcl_count()
-{
- return (getCount() - 0x18) / WW8FIDCL::getSize();
-}
-
-writerfilter::Reference<Properties>::Pointer_t
-DffDGG::get_fidcl(sal_uInt32 pos)
-{
- return writerfilter::Reference<Properties>::Pointer_t
- (new WW8FIDCL(this, 0x18 + pos * WW8FIDCL::getSize()));
-}
-
-
-// DffBSE
-
-OUString DffBSE::get_blipname()
-{
- OUString sResult;
- WW8FBSE aFBSE(this, 0x8);
-
- if (aFBSE.get_cbName() > 0)
- sResult = getString(0x24, aFBSE.get_cbName());
-
- return sResult;
-}
-
-writerfilter::Reference<Properties>::Pointer_t
-DffBSE::get_blip()
-{
- writerfilter::Reference<Properties>::Pointer_t pResult;
-
- return pResult;
-}
-
-// DffFSP
-
-OUString DffFSP::get_shptypename()
-{
- string aName = (*ShapeTypeToString::Instance())(get_shptype());
-
- return OUString::createFromAscii(aName.c_str());
-}
-
-// DffSpContainer
-
-writerfilter::Reference<Properties>::Pointer_t
-DffSpContainer::get_blip()
-{
- writerfilter::Reference<Properties>::Pointer_t pResult;
-
- return pResult;
-}
-
-writerfilter::Reference<Stream>::Pointer_t
-DffSpContainer::get_shptxt()
-{
- writerfilter::Reference<Stream>::Pointer_t pResult;
-
- return pResult;
-}
-
-// DffUDefProp
-
-void DffUDefProp::resolveNoAuto(Properties & rHandler)
-{
- sal_uInt32 nOffset = 0x8;
- sal_uInt32 nCount = getCount();
-
- while (nOffset + 6 <= nCount)
- {
- sal_uInt16 nPid = getU16(nOffset);
- sal_uInt32 nValue = getU32(nOffset + 2);
-
- sal_uInt32 nAttrid = 0;
- switch (nPid)
- {
- case 0x38f: nAttrid = NS_rtf::LN_XAlign; break;
- case 0x390: nAttrid = NS_rtf::LN_XRelTo; break;
- case 0x391: nAttrid = NS_rtf::LN_YAlign; break;
- case 0x392: nAttrid = NS_rtf::LN_YRelTo; break;
- case 0x3bf: nAttrid = NS_rtf::LN_LayoutInTableCell; break;
- case 0x53f: nAttrid = NS_rtf::LN_Inline; break;
- default:
- break;
- }
-
- if (nAttrid != 0)
- {
- WW8Value::Pointer_t pVal = createValue(nValue);
- rHandler.attribute(nAttrid, *pVal);
- }
-
- nOffset += 6;
- }
-}
-
}}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index 2f65169..064a9af 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -41400,12 +41400,6 @@
<!--DFFS-->
<!--DFF UDefProp-->
<UML:Class xmi.id="UDefProp" name="UDefProp">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="dffrecord"/>
- </UML:ModelElement.stereotype>
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="resolvenoauto"/>
- </UML:ModelElement.stereotype>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
<UML:TaggedValue.dataValue>0xf122</UML:TaggedValue.dataValue>
@@ -41426,9 +41420,6 @@
<!--DFF UDefProp-->
<!--DFF FSPGR-->
<UML:Class xmi.id="FSPGR" name="FSPGR">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="dffrecord"/>
- </UML:ModelElement.stereotype>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
<UML:TaggedValue.dataValue>0xf009</UML:TaggedValue.dataValue>
@@ -41572,9 +41563,6 @@
<!--DFF OPT-->
<!--DFF FSP-->
<UML:Class xmi.id="FSP" name="FSP">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="dffrecord"/>
- </UML:ModelElement.stereotype>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
<UML:TaggedValue.dataValue>0xf00a</UML:TaggedValue.dataValue>
@@ -42487,9 +42475,6 @@
<!--DFF FSP-->
<!--DFF DGG-->
<UML:Class xmi.id="DGG" name="DGG">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="dffrecord"/>
- </UML:ModelElement.stereotype>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
<UML:TaggedValue.dataValue>0xf006</UML:TaggedValue.dataValue>
@@ -42590,9 +42575,6 @@
<!--DFF DGG-->
<!--DFF BSE-->
<UML:Class xmi.id="BSE" name="BSE">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="dffrecord"/>
- </UML:ModelElement.stereotype>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
<UML:TaggedValue.dataValue>0xf007</UML:TaggedValue.dataValue>
@@ -42719,9 +42701,6 @@
<!--DFF BSE-->
<!--DFF BlipPng-->
<UML:Class xmi.id="BlipPng" name="BlipPng">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="dffrecord"/>
- </UML:ModelElement.stereotype>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
<UML:TaggedValue.dataValue>0xf01e</UML:TaggedValue.dataValue>
@@ -42779,9 +42758,6 @@
<!--DFF BlipPng-->
<!--DFF BlipDib-->
<UML:Class xmi.id="BlipDib" name="BlipDib">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="dffrecord"/>
- </UML:ModelElement.stereotype>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
<UML:TaggedValue.dataValue>0xf01f</UML:TaggedValue.dataValue>
@@ -42839,9 +42815,6 @@
<!--DFF BlipDib-->
<!--DFF SpContainer-->
<UML:Class xmi.id="SpContainer" name="SpContainer">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="dffrecord"/>
- </UML:ModelElement.stereotype>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
<UML:TaggedValue.dataValue>0xf004</UML:TaggedValue.dataValue>
@@ -42906,9 +42879,6 @@
<!--DFF SpContainer-->
<!--DFF Dg-->
<UML:Class xmi.id="Dg" name="Dg">
- <UML:ModelElement.stereotype>
- <UML:Stereotype xmi.idref="dffrecord"/>
- </UML:ModelElement.stereotype>
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
<UML:TaggedValue.dataValue>0xf008</UML:TaggedValue.dataValue>
diff --git a/writerfilter/source/doctok/resources.xsl b/writerfilter/source/doctok/resources.xsl
index 3c649fb..139fb18 100644
--- a/writerfilter/source/doctok/resources.xsl
+++ b/writerfilter/source/doctok/resources.xsl
@@ -730,66 +730,6 @@ class </xsl:text>
</xsl:choose>
</xsl:template>
-<xsl:template match="UML:Class" mode="dffrecord">
- <xsl:variable name="classname">
- <xsl:text>Dff</xsl:text><xsl:value-of select="@name"/>
- </xsl:variable>
- <xsl:text>
-/**
- Automaticallay generated class:
- </xsl:text>
- <xsl:value-of select="$classname"/>
- <xsl:text>

-*/

-class </xsl:text>
-<xsl:value-of select="$classname"/>
-<xsl:text> : public DffRecord
-{
-public:
- typedef boost::shared_ptr < </xsl:text>
- <xsl:value-of select="$classname"/>
- <xsl:text> > Pointer_t;

- </xsl:text>
- <xsl:value-of select="$classname"/>
- <xsl:text>(WW8StructBase * pParent, sal_uInt32 nOffset, sal_uInt32 nCount)

- : DffRecord(pParent, nOffset, nCount) {}

- </xsl:text>
- <xsl:value-of select="$classname"/>
- <xsl:text>(WW8Stream & rStream, sal_uInt32 nOffset, sal_uInt32 nCount)

- : DffRecord(rStream, nOffset, nCount) {}

- </xsl:text>
- <xsl:value-of select="$classname"/>
- <xsl:text>(DffRecord & rRecord)

- : DffRecord(rRecord) {}
- virtual ~</xsl:text>
- <xsl:value-of select="$classname"/>
- <xsl:text>();
-
- virtual void resolveLocal(Properties & props);</xsl:text>
- <xsl:if test='.//UML:Stereotype[@xmi.idref = "resolvenoauto"]'>
- void resolveNoAuto(Properties & rHandler);
- </xsl:if>
- <xsl:text>
-
- virtual DffRecord * clone() const { return new </xsl:text>
- <xsl:value-of select="$classname"/>
- <xsl:text>(*this); }

- virtual string getType() const
- {
- return "</xsl:text>
- <xsl:value-of select="$classname"/>
- <xsl:text>";
- }
-
- virtual string getName() const { return ""; }
- </xsl:text>
- <xsl:apply-templates select="." mode="declsProperties"/>
- <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 873f989..f384582 100644
--- a/writerfilter/source/doctok/resourcesimpl.xsl
+++ b/writerfilter/source/doctok/resourcesimpl.xsl
@@ -58,11 +58,6 @@ using namespace ::std;
<xsl:with-param name="needsinit">true</xsl:with-param>
</xsl:apply-templates>
</xsl:when>
- <xsl:when test='.//UML:Stereotype[@xmi.idref = "dffrecord"]'>
- <xsl:apply-templates select="." mode="ww8resource">
- <xsl:with-param name="classprefix">Dff</xsl:with-param>
- </xsl:apply-templates>
- </xsl:when>
</xsl:choose>
</xsl:template>
@@ -163,10 +158,6 @@ using namespace ::std;
<xsl:text>::resolve(Properties & </xsl:text>
<xsl:text>)</xsl:text>
</xsl:when>
- <xsl:when test=".//UML:Stereotype[@xmi.idref='dffrecord']">
- <xsl:text>::resolveLocal(Properties & </xsl:text>
- <xsl:text>)</xsl:text>
- </xsl:when>
</xsl:choose>
<xsl:text>
{
diff --git a/writerfilter/source/doctok/tidyxmi.xsl b/writerfilter/source/doctok/tidyxmi.xsl
index b04e9b7..58e6ecc 100644
--- a/writerfilter/source/doctok/tidyxmi.xsl
+++ b/writerfilter/source/doctok/tidyxmi.xsl
@@ -56,7 +56,6 @@
<xsl:apply-templates select="UML:Class[UML:ModelElement.stereotype/UML:Stereotype/@xmi.idref='ww8sprm']"/>
<xsl:comment>SPRMS</xsl:comment>
<xsl:comment>DFFS</xsl:comment>
- <xsl:apply-templates select="UML:Class[UML:ModelElement.stereotype/UML:Stereotype/@xmi.idref='dffrecord']"/>
<xsl:comment>DFFS</xsl:comment>
<xsl:comment>DFFOPT</xsl:comment>
<xsl:apply-templates select="UML:Class[UML:ModelElement.stereotype/UML:Stereotype/@xmi.idref='dffopt']"/>
@@ -90,14 +89,6 @@
<xsl:comment>SPRM <xsl:value-of select="@xmi.id"/></xsl:comment>
</xsl:template>
-<xsl:template match="UML:Class[UML:ModelElement.stereotype/UML:Stereotype/@xmi.idref='dffrecord']">
- <xsl:variable name="theid"><xsl:value-of select="@xmi.id"/></xsl:variable>
- <xsl:comment>DFF <xsl:value-of select="@xmi.id"/></xsl:comment>
- <xsl:copy-of select="."/>
- <xsl:copy-of select="key('generalization', $theid)"/>
- <xsl:comment>DFF <xsl:value-of select="@xmi.id"/></xsl:comment>
-</xsl:template>
-
<xsl:template match="UML:Class[UML:ModelElement.stereotype/UML:Stereotype/@xmi.idref='dffopt']">
<xsl:variable name="theid"><xsl:value-of select="@xmi.id"/></xsl:variable>
<xsl:comment>DFFOPT <xsl:value-of select="@xmi.id"/></xsl:comment>
@@ -106,4 +97,4 @@
<xsl:comment>DFFOPT <xsl:value-of select="@xmi.id"/></xsl:comment>
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
More information about the Libreoffice-commits
mailing list