[Libreoffice-commits] core.git: writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Thu Oct 10 09:58:44 PDT 2013
writerfilter/source/doctok/DffImpl.cxx | 17 --
writerfilter/source/doctok/resources.xsl | 1
writerfilter/source/doctok/resourcesimpl.xsl | 171 ---------------------------
3 files changed, 5 insertions(+), 184 deletions(-)
New commits:
commit 3ef5e2611197fe295c6b3521198390f9ad020f71
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Oct 10 18:56:51 2013 +0200
writerfilter: drop dead isBooleanDffOpt() in doctok
Change-Id: I7be21f126eddc6e49649ea3370a7a181d976360b
diff --git a/writerfilter/source/doctok/DffImpl.cxx b/writerfilter/source/doctok/DffImpl.cxx
index 51141a5..546680f 100644
--- a/writerfilter/source/doctok/DffImpl.cxx
+++ b/writerfilter/source/doctok/DffImpl.cxx
@@ -338,23 +338,8 @@ DffBSE::get_blip()
}
// WW8FOPTE
-void WW8FOPTE::resolveNoAuto(Properties & rHandler)
+void WW8FOPTE::resolveNoAuto(Properties &)
{
- sal_uInt16 nId = get_pid() + 1;
- sal_uInt32 nOp = get_op();
- sal_uInt32 nMask = 2;
-
- while (isBooleanDffOpt(nId))
- {
- WW8Value::Pointer_t pVal = createValue(getDffOptName(nId));
- rHandler.attribute(NS_rtf::LN_shpname, *pVal);
-
- pVal = createValue((nOp & nMask) != 0);
- rHandler.attribute(NS_rtf::LN_shpvalue, *pVal);
-
- --nId;
- nMask = nMask << 1;
- }
}
// DffFSP
diff --git a/writerfilter/source/doctok/resources.xsl b/writerfilter/source/doctok/resources.xsl
index a21d9b2..ecd1409 100644
--- a/writerfilter/source/doctok/resources.xsl
+++ b/writerfilter/source/doctok/resources.xsl
@@ -63,7 +63,6 @@ using namespace ::std;
</xsl:text>
<xsl:apply-templates select="//UML:Class" mode="class"/>
<xsl:text>
OUString getDffOptName(sal_uInt32 nPid);
-bool isBooleanDffOpt(sal_uInt32 nId);
}}
#endif // INCLUDED_RESOURCES_HXX
</xsl:text></out>
</xsl:template>
diff --git a/writerfilter/source/doctok/resourcesimpl.xsl b/writerfilter/source/doctok/resourcesimpl.xsl
index a1e7748..ddc2bd8 100644
--- a/writerfilter/source/doctok/resourcesimpl.xsl
+++ b/writerfilter/source/doctok/resourcesimpl.xsl
@@ -451,47 +451,17 @@ using namespace ::std;
<xsl:param name="classname"/>
<xsl:text>void </xsl:text>
<xsl:value-of select="$classname"/>
- <xsl:text>::resolve(Table & rHandler)
+ <xsl:text>::resolve(Table &)
{
- sal_uInt32 nCount = getEntryCount();
- writerfilter::Reference< Properties >::Pointer_t pEntry;
- for (sal_uInt32 n = 0; n < nCount; ++n)
- {
- pEntry = getEntry(n);
-
- if (pEntry.get() != 0x0)
- {
- try
- {
- rHandler.entry(n, pEntry);
- }
- catch (const ExceptionOutOfBounds&)
- {
- }
- }
- }
}
</xsl:text>
</xsl:template>
<xsl:template match='UML:Model' mode='createsprmprops'>
writerfilter::Reference < Properties > ::Pointer_t createSprmProps
-(WW8PropertyImpl & rProp)
+(WW8PropertyImpl &)
{
writerfilter::Reference < Properties > ::Pointer_t pResult;
-
- switch (rProp.getId())
- {
-<xsl:for-each select='.//UML:Class[.//UML:Stereotype/@xmi.idref="ww8sprm" and .//UML:Stereotype/@xmi.idref="ww8resource"]'>
- case <xsl:value-of select='.//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref="sprmcode"]//UML:TaggedValue.dataValue'/>:
- pResult = writerfilter::Reference < Properties > ::Pointer_t(new WW8<xsl:value-of select='@name'/>(rProp, 0, rProp.getCount()));
-
- break;
-</xsl:for-each>
- default:
- break;
- }
-
return pResult;
}
</xsl:template>
@@ -499,31 +469,9 @@ writerfilter::Reference < Properties > ::Pointer_t createSprmProps
<xsl:template match='UML:Model' mode='createsprmbinary'>
<xsl:text>
writerfilter::Reference < BinaryObj > ::Pointer_t createSprmBinary
-(WW8PropertyImpl & rProp)
+(WW8PropertyImpl &)
{
writerfilter::Reference < BinaryObj > ::Pointer_t pResult;
-
- switch (rProp.getId())
- {

- // warnings....
- case 0:
- break;
-</xsl:text>
-<xsl:for-each select='.//UML:Class[.//UML:Stereotype/@xmi.idref="ww8sprmbinary" and .//UML:Stereotype/@xmi.idref="ww8resource"]'>
- case <xsl:value-of select='.//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref="sprmcode"]//UML:TaggedValue.dataValue'/>:
- {
- WW8<xsl:value-of select='@name'/>::Pointer_t p(new WW8<xsl:value-of select='@name'/>(rProp, 0, rProp.getCount()));
-
- pResult = p->getBinary();
- }
-
- break;
-</xsl:for-each>
-<xsl:text>
- default:
- break;
- }
-
return pResult;
}
</xsl:text>
@@ -556,20 +504,9 @@ writerfilter::Reference < BinaryObj > ::Pointer_t createSprmBinary
<xsl:template name="getdffoptname">
<xsl:text>
-OUString getDffOptName(sal_uInt32 nPid)
+OUString getDffOptName(sal_uInt32)
{
OUString result;
-
- switch (nPid)
- {
</xsl:text>
- <xsl:for-each select="./UML:Class[./UML:ModelElement.stereotype/UML:Stereotype/@xmi.idref='dffopt']">
- <xsl:call-template name="ww8foptenamecase"/>
- </xsl:for-each>
- <xsl:text>
- default:
- break;
- }
-
return result;
}</xsl:text>
</xsl:template>
@@ -579,71 +516,6 @@ OUString getDffOptName(sal_uInt32 nPid)
WW8Value::Pointer_t WW8FOPTE::get_value()
{
WW8Value::Pointer_t pResult;
-
- switch (get_pid())
- {</xsl:text>
- <xsl:for-each select=".//UML:Class[./UML:ModelElement.stereotype/UML:Stereotype/@xmi.idref='dffopt']">
- <xsl:variable name="type">
- <xsl:for-each select="./UML:ModelElement.taggedValue/UML:TaggedValue[./UML:TaggedValue.type/UML:TagDefinition/@xmi.idref='type']">
- <xsl:value-of select="UML:TaggedValue.dataValue"/>
- </xsl:for-each>
- </xsl:variable>
- <xsl:if test="$type != 'unknown'">
- <xsl:variable name="typetype">
- <xsl:call-template name="typetype">
- <xsl:with-param name="type" select="$type"/>
- </xsl:call-template>
- </xsl:variable>
- <xsl:variable name="valuetype">
- <xsl:call-template name="valuetype">
- <xsl:with-param name="type" select="$type"/>
- </xsl:call-template>
- </xsl:variable>
- <xsl:text>
- case </xsl:text>
- <xsl:for-each select="./UML:ModelElement.taggedValue/UML:TaggedValue[./UML:TaggedValue.type/UML:TagDefinition/@xmi.idref='dffid']">
- <xsl:value-of select="UML:TaggedValue.dataValue"/>
- </xsl:for-each>
- <xsl:variable name="optname">
- <xsl:for-each select="./UML:ModelElement.taggedValue/UML:TaggedValue[./UML:TaggedValue.type/UML:TagDefinition/@xmi.idref='optname']">
- <xsl:value-of select="UML:TaggedValue.dataValue"/>
- </xsl:for-each>
- </xsl:variable>
- <xsl:call-template name="idtoqname">
- <xsl:with-param name="id" select="$optname"/>
- </xsl:call-template>
- <xsl:text>:</xsl:text>
- <xsl:choose>
- <xsl:when test="./UML:ModelElement.taggedValue/UML:TaggedValue[./UML:TaggedValue.type/UML:TagDefinition/@xmi.idref='isbool']">
- <xsl:text>
- pResult = createValue(getU32(0x2) & 1);</xsl:text>
- </xsl:when>
- <xsl:when test="$typetype='complex'">
- <xsl:text>
- pResult = createValue(new </xsl:text>
- <xsl:value-of select="$valuetype"/>
- <xsl:text>(getU32(0x2)));</xsl:text>
- </xsl:when>
- <xsl:when test="$typetype='string'">
- <xsl:text>
- pResult = get_stringValue();
</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>
- pResult = createValue(getU32(0x2));</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:text>
- break;</xsl:text>
- </xsl:if>
- </xsl:for-each>
- <xsl:text>
- default:
- pResult = createValue(getU32(0x2));
-
- break;
- }
-
return pResult;
}</xsl:text>
</xsl:template>
@@ -660,11 +532,6 @@ OUString WW8FOPTE::get_name()
WW8Value::Pointer_t WW8FOPTE::get_stringValue()
{
WW8Value::Pointer_t pResult;
- DffOPT * pOpt = dynamic_cast < DffOPT * >(mpParent);
- sal_uInt32 nExtraOffset = pOpt->get_extraoffset(mnIndex);
- sal_uInt32 nExtraLength = pOpt->get_extraoffset(mnIndex + 1) - nExtraOffset;
- pResult = createValue(mpParent->getString(nExtraOffset, nExtraLength / 2));
-
return pResult;
}
</xsl:text>
@@ -738,36 +605,6 @@ Shift: <xsl:value-of select='$shift'/>
</xsl:template>
<xsl:template match="UML:Model" mode="isbooleandffopt">
-<xsl:text>
-bool isBooleanDffOpt(sal_uInt32 nId)
-{
- bool bResult = false;
-
- switch (nId)
- {
</xsl:text>
- <xsl:for-each select='.//UML:Class[.//UML:Stereotype/@xmi.idref="dffopt"]'>
- <xsl:if test=".//UML:TagDefinition[@xmi.idref='isbool']">
- <xsl:text> case </xsl:text>
- <xsl:variable name="optname">
- <xsl:value-of select=".//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref='optname']//UML:TaggedValue.dataValue"/>
- </xsl:variable>
- <xsl:call-template name="idtoqname">
- <xsl:with-param name="id" select="$optname"/>
- </xsl:call-template>
- <xsl:text>:
</xsl:text>
- </xsl:if>
- </xsl:for-each>
- <xsl:text>
- bResult = true;
- break;
-
- default:
- break;
- }
-
- return bResult;
-}
-</xsl:text>
</xsl:template>
</xsl:stylesheet>
More information about the Libreoffice-commits
mailing list