Kaydet (Commit) 7bb5ae7c authored tarafından Miklos Vajna's avatar Miklos Vajna

writerfilter: unused initChildren/Payload methods in doctok

Change-Id: I6b8d728011c2b70061dbdcdc3daba37422f99306
üst 0e452128
...@@ -42,17 +42,11 @@ DffRecord::DffRecord(WW8StructBase * pParent, sal_uInt32 nOffset, ...@@ -42,17 +42,11 @@ DffRecord::DffRecord(WW8StructBase * pParent, sal_uInt32 nOffset,
Records_t::iterator DffRecord::begin() Records_t::iterator DffRecord::begin()
{ {
if (! bInitialized)
initChildren();
return mRecords.begin(); return mRecords.begin();
} }
Records_t::iterator DffRecord::end() Records_t::iterator DffRecord::end()
{ {
if (! bInitialized)
initChildren();
return mRecords.end(); return mRecords.end();
} }
...@@ -105,10 +99,6 @@ sal_uInt32 DffRecord::getRecordType() const ...@@ -105,10 +99,6 @@ sal_uInt32 DffRecord::getRecordType() const
return getU16(0x2); return getU16(0x2);
} }
void DffRecord::initChildren()
{
}
Records_t DffRecord::findRecords(sal_uInt32 nType, bool bRecursive, bool bAny) Records_t DffRecord::findRecords(sal_uInt32 nType, bool bRecursive, bool bAny)
{ {
Records_t aResult; Records_t aResult;
...@@ -353,10 +343,6 @@ DffBlock::DffBlock(const DffBlock & rSrc) ...@@ -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 DffBlock::findRecords(sal_uInt32 nType, bool bRecursive, bool bAny)
{ {
Records_t aResult; Records_t aResult;
...@@ -447,17 +433,11 @@ DffRecord::Pointer_t DffBlock::getBlip(sal_uInt32 nBlip) ...@@ -447,17 +433,11 @@ DffRecord::Pointer_t DffBlock::getBlip(sal_uInt32 nBlip)
Records_t::iterator DffBlock::begin() Records_t::iterator DffBlock::begin()
{ {
if (! bInitialized)
initChildren();
return mRecords.begin(); return mRecords.begin();
} }
Records_t::iterator DffBlock::end() Records_t::iterator DffBlock::end()
{ {
if (! bInitialized)
initChildren();
return mRecords.end(); return mRecords.end();
} }
......
...@@ -42,8 +42,6 @@ protected: ...@@ -42,8 +42,6 @@ protected:
typedef vector<Pointer_t> Records_t; typedef vector<Pointer_t> Records_t;
Records_t mRecords; Records_t mRecords;
void initChildren();
public: public:
DffRecord(WW8Stream & rStream, sal_uInt32 nOffset, sal_uInt32 nCount); DffRecord(WW8Stream & rStream, sal_uInt32 nOffset, sal_uInt32 nCount);
...@@ -105,9 +103,6 @@ class DffBlock : public WW8StructBase, ...@@ -105,9 +103,6 @@ class DffBlock : public WW8StructBase,
Records_t mRecords; Records_t mRecords;
protected:
void initChildren();
public: public:
typedef boost::shared_ptr<DffBlock> Pointer_t; typedef boost::shared_ptr<DffBlock> Pointer_t;
......
...@@ -22,28 +22,6 @@ ...@@ -22,28 +22,6 @@
namespace writerfilter { namespace writerfilter {
namespace doctok { 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() sal_uInt32 WW8FontTable::getEntryCount()
{ {
return entryOffsets.size() - 1; return entryOffsets.size() - 1;
......
...@@ -22,38 +22,6 @@ ...@@ -22,38 +22,6 @@
namespace writerfilter { namespace writerfilter {
namespace doctok { 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() sal_uInt32 WW8LFOTable::getEntryCount()
{ {
return getU32(0); return getU32(0);
......
...@@ -23,43 +23,6 @@ ...@@ -23,43 +23,6 @@
namespace writerfilter { namespace writerfilter {
namespace doctok { 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() sal_uInt32 WW8ListTable::getEntryCount()
{ {
return getU16(0); return getU16(0);
......
...@@ -22,22 +22,6 @@ ...@@ -22,22 +22,6 @@
namespace writerfilter { namespace writerfilter {
namespace doctok { 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() sal_uInt32 WW8StyleSheet::getEntryCount()
{ {
return get_cstd(); return get_cstd();
......
...@@ -229,12 +229,6 @@ class </xsl:text> ...@@ -229,12 +229,6 @@ class </xsl:text>
virtual ~</xsl:text> virtual ~</xsl:text>
<xsl:value-of select="$classname"/> <xsl:value-of select="$classname"/>
<xsl:text>();&#xa;</xsl:text> <xsl:text>();&#xa;</xsl:text>
<xsl:if test='.//UML:Stereotype[@xmi.idref ="initimpl"]'>
<xsl:text> void initImpl();&#xa;</xsl:text>
</xsl:if>
<xsl:if test='.//UML:Stereotype[@xmi.idref ="plcf"]'>
<xsl:text> void initPayload();</xsl:text>
</xsl:if>
<xsl:text> <xsl:text>
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment