diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-10-16 20:59:21 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-10-16 21:06:12 +0200 |
| commit | ee1187452ba0312cbef6406ea95c7ae39486076d (patch) | |
| tree | 3bbdff4fe61c2e6f9711f2b1d20bf3700488d36c | |
| parent | e9bcc4f814ba4a13942732dcabb3ae992af13735 (diff) | |
writerfilter: remove unused WW8ListLevel class
Change-Id: Ib1058fcc10100938a34fae18e94fa9fd21ebfb36
| -rw-r--r-- | writerfilter/source/doctok/WW8LFOTable.cxx | 11 | ||||
| -rw-r--r-- | writerfilter/source/doctok/WW8ListTable.cxx | 53 | ||||
| -rw-r--r-- | writerfilter/source/doctok/resources.xmi | 6 |
3 files changed, 2 insertions, 68 deletions
diff --git a/writerfilter/source/doctok/WW8LFOTable.cxx b/writerfilter/source/doctok/WW8LFOTable.cxx index 5c41219344c8..aef163989b98 100644 --- a/writerfilter/source/doctok/WW8LFOTable.cxx +++ b/writerfilter/source/doctok/WW8LFOTable.cxx @@ -57,17 +57,6 @@ sal_uInt32 WW8LFOLevel::calcSize() { sal_uInt32 nResult = WW8LFOLevel::getSize(); - if (get_fFormatting()) - { - WW8ListLevel aLevel(mpParent, mnOffsetInParent + nResult); - - nResult += aLevel.calcSize(); - - sal_uInt32 nXstSize = mpParent->getU16(mnOffsetInParent + nResult); - - nResult += (nXstSize + 1) * 2; - } - return nResult; } diff --git a/writerfilter/source/doctok/WW8ListTable.cxx b/writerfilter/source/doctok/WW8ListTable.cxx index 380c19d3d285..5d71a390aadb 100644 --- a/writerfilter/source/doctok/WW8ListTable.cxx +++ b/writerfilter/source/doctok/WW8ListTable.cxx @@ -48,60 +48,11 @@ sal_uInt32 WW8List::get_listlevel_count() } writerfilter::Reference<Properties>::Pointer_t -WW8List::get_listlevel(sal_uInt32 nIndex) +WW8List::get_listlevel(sal_uInt32 /*nIndex*/) { - WW8ListTable * pListTable = dynamic_cast<WW8ListTable *>(mpParent); - sal_uInt32 nPayloadIndex = pListTable->getPayloadIndex(mnIndex) + nIndex; - sal_uInt32 nPayloadOffset = pListTable->getPayloadOffset(nPayloadIndex); - sal_uInt32 nPayloadSize = pListTable->getPayloadSize(nPayloadIndex); - - return writerfilter::Reference<Properties>::Pointer_t - (new WW8ListLevel(mpParent, nPayloadOffset, nPayloadSize)); -} - -OUString WW8ListLevel::get_xst() -{ - sal_uInt32 nOffset = WW8ListLevel::getSize(); - - nOffset += get_cbGrpprlPapx(); - nOffset += get_cbGrpprlChpx(); - - return getString(nOffset); + return writerfilter::Reference<Properties>::Pointer_t(); } -void WW8ListLevel::resolveNoAuto(Properties & rHandler) -{ - sal_uInt32 nOffset = getSize(); - - { - WW8PropertySet::Pointer_t pSet - (new WW8PropertySetImpl(*this, nOffset, get_cbGrpprlPapx())); - - WW8PropertiesReference aRef(pSet); - aRef.resolve(rHandler); - } - - nOffset += get_cbGrpprlPapx(); - - { - WW8PropertySet::Pointer_t pSet - (new WW8PropertySetImpl(*this, nOffset, get_cbGrpprlChpx())); - - WW8PropertiesReference aRef(pSet); - aRef.resolve(rHandler); - } -} - -sal_uInt32 WW8ListLevel::calcSize() -{ - sal_uInt32 nResult = WW8ListLevel::getSize(); - - nResult += get_cbGrpprlPapx(); - nResult += get_cbGrpprlChpx(); - nResult += 2 + getU16(nResult) * 2; - - return nResult; -} }} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index 74f6c1e0059a..d04e3aadfc34 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -595,12 +595,6 @@ <!--WW8 resources--> <!--Class ListLevel--> <UML:Class xmi.id="ListLevel" name="ListLevel"> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="ww8resource"/> - </UML:ModelElement.stereotype> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="resolvenoauto"/> - </UML:ModelElement.stereotype> <UML:ModelElement.taggedValue> <UML:TaggedValue> <UML:TaggedValue.dataValue>28</UML:TaggedValue.dataValue> |