diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-10-14 21:42:15 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-10-14 21:49:30 +0200 |
commit | 7bb5ae7ca6e8900286202475a1e5c9fed3995242 (patch) | |
tree | 147aac03a7a05db43270a223625dd7b2f445d853 /writerfilter/source/doctok | |
parent | 0e45212822e4ed99251691c8d0ed6a89d8418678 (diff) |
writerfilter: unused initChildren/Payload methods in doctok
Change-Id: I6b8d728011c2b70061dbdcdc3daba37422f99306
Diffstat (limited to 'writerfilter/source/doctok')
-rw-r--r-- | writerfilter/source/doctok/Dff.cxx | 20 | ||||
-rw-r--r-- | writerfilter/source/doctok/Dff.hxx | 5 | ||||
-rw-r--r-- | writerfilter/source/doctok/WW8FontTable.cxx | 22 | ||||
-rw-r--r-- | writerfilter/source/doctok/WW8LFOTable.cxx | 32 | ||||
-rw-r--r-- | writerfilter/source/doctok/WW8ListTable.cxx | 37 | ||||
-rw-r--r-- | writerfilter/source/doctok/WW8StyleSheet.cxx | 16 | ||||
-rw-r--r-- | writerfilter/source/doctok/resources.xsl | 6 |
7 files changed, 0 insertions, 138 deletions
diff --git a/writerfilter/source/doctok/Dff.cxx b/writerfilter/source/doctok/Dff.cxx index e66d7166b4b7..026e92f5e9bd 100644 --- a/writerfilter/source/doctok/Dff.cxx +++ b/writerfilter/source/doctok/Dff.cxx @@ -42,17 +42,11 @@ DffRecord::DffRecord(WW8StructBase * pParent, sal_uInt32 nOffset, Records_t::iterator DffRecord::begin() { - if (! bInitialized) - initChildren(); - return mRecords.begin(); } Records_t::iterator DffRecord::end() { - if (! bInitialized) - initChildren(); - return mRecords.end(); } @@ -105,10 +99,6 @@ sal_uInt32 DffRecord::getRecordType() const return getU16(0x2); } -void DffRecord::initChildren() -{ -} - Records_t DffRecord::findRecords(sal_uInt32 nType, bool bRecursive, bool bAny) { Records_t aResult; @@ -353,10 +343,6 @@ DffBlock::DffBlock(const DffBlock & rSrc) { } -void DffBlock::initChildren() -{ -} - Records_t DffBlock::findRecords(sal_uInt32 nType, bool bRecursive, bool bAny) { Records_t aResult; @@ -447,17 +433,11 @@ DffRecord::Pointer_t DffBlock::getBlip(sal_uInt32 nBlip) Records_t::iterator DffBlock::begin() { - if (! bInitialized) - initChildren(); - return mRecords.begin(); } Records_t::iterator DffBlock::end() { - if (! bInitialized) - initChildren(); - return mRecords.end(); } diff --git a/writerfilter/source/doctok/Dff.hxx b/writerfilter/source/doctok/Dff.hxx index 62b8ef606929..7225367eb53b 100644 --- a/writerfilter/source/doctok/Dff.hxx +++ b/writerfilter/source/doctok/Dff.hxx @@ -42,8 +42,6 @@ protected: typedef vector<Pointer_t> Records_t; Records_t mRecords; - void initChildren(); - public: DffRecord(WW8Stream & rStream, sal_uInt32 nOffset, sal_uInt32 nCount); @@ -105,9 +103,6 @@ class DffBlock : public WW8StructBase, Records_t mRecords; -protected: - void initChildren(); - public: typedef boost::shared_ptr<DffBlock> Pointer_t; diff --git a/writerfilter/source/doctok/WW8FontTable.cxx b/writerfilter/source/doctok/WW8FontTable.cxx index 2ecfe15a30f1..95fc233593c1 100644 --- a/writerfilter/source/doctok/WW8FontTable.cxx +++ b/writerfilter/source/doctok/WW8FontTable.cxx @@ -22,28 +22,6 @@ namespace writerfilter { namespace doctok { -void WW8FontTable::initPayload() -{ - sal_uInt32 nCount = getU8(0); - - sal_uInt32 nOffset = 1; - - while (nCount > 0) - { - entryOffsets.push_back(nOffset); - - sal_uInt32 nFFNSize = getU8(nOffset) + 1; - - if (nFFNSize > 1) - nCount--; - - nOffset += nFFNSize; - } - - entryOffsets.push_back(nOffset); - mnPlcfPayloadOffset = nOffset; -} - sal_uInt32 WW8FontTable::getEntryCount() { return entryOffsets.size() - 1; diff --git a/writerfilter/source/doctok/WW8LFOTable.cxx b/writerfilter/source/doctok/WW8LFOTable.cxx index 9f896bb17223..5c41219344c8 100644 --- a/writerfilter/source/doctok/WW8LFOTable.cxx +++ b/writerfilter/source/doctok/WW8LFOTable.cxx @@ -22,38 +22,6 @@ namespace writerfilter { namespace doctok { -void WW8LFOTable::initPayload() -{ - sal_uInt32 nCount = getEntryCount(); - - sal_uInt32 nOffset = 4; - sal_uInt32 nOffsetLFOData = mnPlcfPayloadOffset; - - for (sal_uInt32 n = 0; n < nCount; ++n) - { - WW8LFO aLFO(this, nOffset); - - entryOffsets.push_back(nOffset); - nOffset += WW8LFO::getSize(); - - payloadOffsets.push_back(nOffsetLFOData); - payloadIndices.push_back(n); - - nOffsetLFOData += 4; - - sal_uInt32 nLvls = aLFO.get_clfolvl(); - - for (sal_uInt32 k = 0; k < nLvls; ++k) - { - WW8LFOLevel aLevel(this, nOffsetLFOData); - nOffsetLFOData += aLevel.calcSize(); - } - } - - entryOffsets.push_back(nOffset); - payloadOffsets.push_back(nOffsetLFOData); -} - sal_uInt32 WW8LFOTable::getEntryCount() { return getU32(0); diff --git a/writerfilter/source/doctok/WW8ListTable.cxx b/writerfilter/source/doctok/WW8ListTable.cxx index 3d6eb21d3ec2..380c19d3d285 100644 --- a/writerfilter/source/doctok/WW8ListTable.cxx +++ b/writerfilter/source/doctok/WW8ListTable.cxx @@ -23,43 +23,6 @@ namespace writerfilter { namespace doctok { -void WW8ListTable::initPayload() -{ - sal_uInt32 nCount = getEntryCount(); - - sal_uInt32 nOffset = 2; - sal_uInt32 nOffsetLevel = mnPlcfPayloadOffset; - for (sal_uInt32 n = 0; n < nCount; ++n) - { - WW8List aList(this, nOffset); - - entryOffsets.push_back(nOffset); - payloadIndices.push_back(payloadOffsets.size()); - nOffset += WW8List::getSize(); - - sal_uInt32 nLvlCount = aList.get_fSimpleList() ? 1 : 9; - - for (sal_uInt32 i = 0; i < nLvlCount; ++i) - { - WW8ListLevel aLevel(this, nOffsetLevel); - - payloadOffsets.push_back(nOffsetLevel); - - nOffsetLevel += aLevel.calcSize(); - } - - if (nOffsetLevel > getCount()) - { - nOffsetLevel = getCount(); - - break; - } - } - - payloadOffsets.push_back(nOffsetLevel); - entryOffsets.push_back(nOffset); -} - sal_uInt32 WW8ListTable::getEntryCount() { return getU16(0); diff --git a/writerfilter/source/doctok/WW8StyleSheet.cxx b/writerfilter/source/doctok/WW8StyleSheet.cxx index 3b7c298e7847..2231d0bc43fb 100644 --- a/writerfilter/source/doctok/WW8StyleSheet.cxx +++ b/writerfilter/source/doctok/WW8StyleSheet.cxx @@ -22,22 +22,6 @@ namespace writerfilter { namespace doctok { -void WW8StyleSheet::initPayload() -{ - sal_uInt32 nCount = getEntryCount(); - - sal_uInt32 nOffset = get_size() + 2; - for (sal_uInt32 n = 0; n < nCount; ++n) - { - entryOffsets.push_back(nOffset); - - sal_uInt32 cbStd = getU16(nOffset); - nOffset += cbStd + 2; - } - - entryOffsets.push_back(nOffset); -} - sal_uInt32 WW8StyleSheet::getEntryCount() { return get_cstd(); diff --git a/writerfilter/source/doctok/resources.xsl b/writerfilter/source/doctok/resources.xsl index 7c38d1a691fe..11eaeb8f3ac5 100644 --- a/writerfilter/source/doctok/resources.xsl +++ b/writerfilter/source/doctok/resources.xsl @@ -229,12 +229,6 @@ class </xsl:text> virtual ~</xsl:text> <xsl:value-of select="$classname"/> <xsl:text>();
</xsl:text> - <xsl:if test='.//UML:Stereotype[@xmi.idref ="initimpl"]'> - <xsl:text> void initImpl();
</xsl:text> - </xsl:if> - <xsl:if test='.//UML:Stereotype[@xmi.idref ="plcf"]'> - <xsl:text> void initPayload();</xsl:text> - </xsl:if> <xsl:text> /** |