diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-09-26 20:23:58 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-09-26 20:37:04 +0200 |
commit | 7367bd9fff37031d5ddcfe926dd3a7f6ecdb0500 (patch) | |
tree | 309c5786ede661222fa5e6a09991d314ff238133 /writerfilter/source | |
parent | Fix Infobar crash (diff) | |
download | core-7367bd9fff37031d5ddcfe926dd3a7f6ecdb0500.tar.gz core-7367bd9fff37031d5ddcfe926dd3a7f6ecdb0500.zip |
writerfilter: remove dead createDffRecord
Change-Id: I27dc30c8aba7b77cdac771ca733fadb805a5c75b
Diffstat (limited to 'writerfilter/source')
-rw-r--r-- | writerfilter/source/doctok/Dff.cxx | 39 | ||||
-rw-r--r-- | writerfilter/source/doctok/Dff.hxx | 7 | ||||
-rw-r--r-- | writerfilter/source/doctok/resourcesimpl.xsl | 63 |
3 files changed, 0 insertions, 109 deletions
diff --git a/writerfilter/source/doctok/Dff.cxx b/writerfilter/source/doctok/Dff.cxx index f39505e77235..e66d7166b4b7 100644 --- a/writerfilter/source/doctok/Dff.cxx +++ b/writerfilter/source/doctok/Dff.cxx @@ -107,27 +107,6 @@ sal_uInt32 DffRecord::getRecordType() const void DffRecord::initChildren() { - if (isContainer()) - { - sal_uInt32 nOffset = 8; - sal_uInt32 nCount = calcSize(); - - while (nCount - nOffset >= 8) - { - sal_uInt32 nSize = 0; - boost::shared_ptr<DffRecord> pRec - (createDffRecord(this, nOffset, &nSize)); - - if (nSize == 0) - break; - - mRecords.push_back(pRec); - - nOffset += nSize; - } - } - - bInitialized = true; } Records_t DffRecord::findRecords(sal_uInt32 nType, bool bRecursive, bool bAny) @@ -376,24 +355,6 @@ DffBlock::DffBlock(const DffBlock & rSrc) void DffBlock::initChildren() { - sal_uInt32 nOffset = 0; - sal_uInt32 nCount = getCount(); - - while (nOffset < nCount) - { - sal_uInt32 nSize = 0; - DffRecord::Pointer_t pDffRecord - (createDffRecord(this, nOffset, &nSize)); - - if (nSize == 0) - break; - - mRecords.push_back(pDffRecord); - - nOffset += nSize + mnPadding; - } - - bInitialized = true; } Records_t DffBlock::findRecords(sal_uInt32 nType, bool bRecursive, bool bAny) diff --git a/writerfilter/source/doctok/Dff.hxx b/writerfilter/source/doctok/Dff.hxx index ef438086ba0b..62b8ef606929 100644 --- a/writerfilter/source/doctok/Dff.hxx +++ b/writerfilter/source/doctok/Dff.hxx @@ -133,13 +133,6 @@ public: virtual string getType() const; }; -DffRecord * -createDffRecord(WW8StructBase * pParent, sal_uInt32 nOffset, - sal_uInt32 * nSize = NULL); -DffRecord * -createDffRecord(WW8Stream & rStream, sal_uInt32 nOffset, - sal_uInt32 * nSize = NULL); - }} #endif diff --git a/writerfilter/source/doctok/resourcesimpl.xsl b/writerfilter/source/doctok/resourcesimpl.xsl index d0b714dc36fc..196b44e724e2 100644 --- a/writerfilter/source/doctok/resourcesimpl.xsl +++ b/writerfilter/source/doctok/resourcesimpl.xsl @@ -679,69 +679,6 @@ WW8Value::Pointer_t WW8FOPTE::get_stringValue() <xsl:template match="UML:Model" mode="createdffrecord"> <xsl:text> -DffRecord * createDffRecord -(WW8StructBase * pParent, sal_uInt32 nOffset, sal_uInt32 * pCount) -{ - DffRecord * pResult = NULL; - DffRecord aTmpRec(pParent, nOffset, 8); - sal_uInt32 nSize = aTmpRec.calcSize(); - - if (pCount != NULL) - *pCount = nSize; - - switch (aTmpRec.getRecordType()) - {
</xsl:text> - <xsl:for-each select='.//UML:Class[.//UML:Stereotype/@xmi.idref="dffrecord"]'> - <xsl:text> case </xsl:text> - <xsl:value-of select=".//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref='dffid']//UML:TaggedValue.dataValue"/> - <xsl:text>: - pResult = new Dff</xsl:text> - <xsl:value-of select="@name"/> - <xsl:text>(pParent, nOffset, nSize); - - break;
</xsl:text> - </xsl:for-each> - <xsl:text> - default: - pResult = new DffRecord(pParent, nOffset, nSize); - - break; - } - - return pResult; -} - -DffRecord * createDffRecord -(WW8Stream & rStream, sal_uInt32 nOffset, sal_uInt32 * pCount) -{ - DffRecord * pResult = NULL; - DffRecord aTmpRec(rStream, nOffset, 8); - sal_uInt32 nSize = aTmpRec.calcSize(); - - if (pCount != NULL) - *pCount = nSize; - - switch (aTmpRec.getRecordType()) - {
</xsl:text> - <xsl:for-each select='.//UML:Class[.//UML:Stereotype/@xmi.idref="dffrecord"]'> - <xsl:text> case </xsl:text> - <xsl:value-of select=".//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref='dffid']//UML:TaggedValue.dataValue"/> - <xsl:text>: - pResult = new Dff</xsl:text> - <xsl:value-of select="@name"/> - <xsl:text>(rStream, nOffset, nSize); - - break;
</xsl:text> - </xsl:for-each> - <xsl:text> - default: - pResult = new DffRecord(rStream, nOffset, nSize); - - break; - } - - return pResult; -} </xsl:text> </xsl:template> |