From cce7939a166bbf9713ea06bcd3901dfaf162126d Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 17 Oct 2013 19:20:55 +0200 Subject: [PATCH] writerfilter: remove unused WW8Style class Change-Id: I24af395c6899e9b3551bd7ff473ada2315812173 --- writerfilter/source/doctok/WW8StyleSheet.cxx | 142 +--- writerfilter/source/doctok/resources.xmi | 660 ------------------- 2 files changed, 1 insertion(+), 801 deletions(-) diff --git a/writerfilter/source/doctok/WW8StyleSheet.cxx b/writerfilter/source/doctok/WW8StyleSheet.cxx index 2231d0bc43fb..7137632f35c0 100644 --- a/writerfilter/source/doctok/WW8StyleSheet.cxx +++ b/writerfilter/source/doctok/WW8StyleSheet.cxx @@ -28,152 +28,12 @@ sal_uInt32 WW8StyleSheet::getEntryCount() } writerfilter::Reference::Pointer_t -WW8StyleSheet::getEntry(sal_uInt32 nIndex) +WW8StyleSheet::getEntry(sal_uInt32) { writerfilter::Reference::Pointer_t pResult; - - sal_uInt32 nCount = entryOffsets[nIndex + 1] - entryOffsets[nIndex]; - - if (nCount > get_cbSTDBaseInFile() + 2U) - { - WW8Style * pStyle = new WW8Style(this, entryOffsets[nIndex], nCount); - - pStyle->setIndex(nIndex); - - pResult = writerfilter::Reference::Pointer_t(pStyle); - } - return pResult; } -OUString WW8Style::get_xstzName() -{ - sal_uInt32 nCount = getU8(0xc); - - if (nCount > 0) - { - Sequence aSeq(mSequence, 0xe, nCount * 2); - - rtl_uString * pNew = 0; - rtl_uString_newFromStr - (&pNew, reinterpret_cast(&aSeq[0])); - - return OUString(pNew); - - } - - return get_xstzName1(); -} - -OUString WW8Style::get_xstzName1() -{ - WW8StyleSheet * pParentStyleSheet = dynamic_cast(mpParent); - - if (mpParent != NULL) - { - sal_uInt32 nOffset = pParentStyleSheet->get_cbSTDBaseInFile() + 2; - - if (nOffset < getCount()) - { - sal_uInt32 nCount = getU16(nOffset); - - if (nCount > 0) - { - Sequence aSeq(mSequence, nOffset + 2, nCount * 2); - - rtl_uString * pNew = 0; - rtl_uString_newFromStr - (&pNew, reinterpret_cast(&aSeq[0])); - - return OUString(pNew); - - } - } - } - - return OUString(); -} - -sal_uInt32 WW8Style::get_upxstart() -{ - sal_uInt32 nResult = 0; - sal_uInt32 nCount = getU8(0xc); - - if (nCount > 0) - { - nResult = 0xc + 1 + nCount * 2; - - nResult += nResult % 2; - } - else - { - WW8StyleSheet * pParentStyleSheet = - dynamic_cast(mpParent); - - nResult = pParentStyleSheet->get_cbSTDBaseInFile() + 2; - - if (nResult < getCount()) - { - sal_uInt32 nCountTmp = getU16(nResult); - - nResult += 4 + nCountTmp * 2; - } - } - - return nResult; -} - -sal_uInt32 WW8Style::get_upx_count() -{ - return get_cupx(); -} - -writerfilter::Reference::Pointer_t WW8Style::get_upx -(sal_uInt32 nIndex) -{ - writerfilter::Reference::Pointer_t pResult; - - WW8StructBaseTmpOffset aOffset(this); - - aOffset.set(get_upxstart()); - - if (aOffset.get() > 0 ) - { - sal_uInt32 nCount; - - for (sal_uInt32 n = 0; n < nIndex; ++n) - { - nCount = getU16(aOffset); - - aOffset.inc(nCount + 2); - aOffset.inc(aOffset.get() % 2); - } - - nCount = getU16(aOffset); - - if (nCount > 0) - { - aOffset.inc(2); - - bool bIsPap = get_cupx() == 2 && nIndex == 0; - WW8PropertySet::Pointer_t - pProps(new WW8PropertySetImpl(*this, aOffset.get(), nCount, - bIsPap)); - - WW8PropertiesReference * pRef = - new WW8PropertiesReference(pProps); - - pResult = writerfilter::Reference::Pointer_t(pRef); - } - } - - return pResult; -} - -void WW8Style::resolveNoAuto(Properties & /*rHandler*/) -{ -} - }} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index 8dca3a73aa32..bac140d9acf7 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -3925,57 +3925,8 @@ - - - - - - - - - - - - invariant style identifier - - - - - - - - 0x2 - - - - - - - - 0 - - - - - - - - 0FFF - - - - - - - - :12 - - - - - rtf:STI @@ -3984,57 +3935,10 @@ - - - - - - - - - spare field for any temporary use, always reset back to - zero! - - - - - - - - 0x2 - - - - - - - - 12 - - - - - - - - 1000 - - - - - - - - :1 - - - - - rtf:FSCRATCH @@ -4043,56 +3947,10 @@ - - - - - - - - - PHEs of all text with this style are wrong - - - - - - - - 0x2 - - - - - - - - 13 - - - - - - - - 2000 - - - - - - - - :1 - - - - - rtf:FINVALHEIGHT @@ -4101,56 +3959,10 @@ - - - - - - - - - UPEs have been generated - - - - - - - - 0x2 - - - - - - - - 14 - - - - - - - - 4000 - - - - - - - - :1 - - - - - rtf:FHASUPE @@ -4159,57 +3971,10 @@ - - - - - - - - - std has been mass-copied; if unused at save time, style should - be deleted - - - - - - - - 0x2 - - - - - - - - 15 - - - - - - - - 8000 - - - - - - - - :1 - - - - - rtf:FMASSCOPY @@ -4218,56 +3983,10 @@ - - - - - - - - - style type code - - - - - - - - 0x4 - - - - - - - - 0 - - - - - - - - 000F - - - - - - - - :4 - - - - - rtf:SGC @@ -4276,56 +3995,10 @@ - - - - - - - - - base style - - - - - - - - 0x4 - - - - - - - - 4 - - - - - - - - FFF0 - - - - - - - - :12 - - - - - rtf:ISTDBASE @@ -4334,56 +4007,10 @@ - - - - - - - - - # of UPXs (and UPEs) - - - - - - - - 0x6 - - - - - - - - 0 - - - - - - - - 000F - - - - - - - - :4 - - - - - rtf:CUPX @@ -4392,56 +4019,10 @@ - - - - - - - - - next style - - - - - - - - 0x6 - - - - - - - - 4 - - - - - - - - FFF0 - - - - - - - - :12 - - - - - rtf:ISTDNEXT @@ -4450,56 +4031,10 @@ - - - - - - - - - offset to end of upx's, start of upe's - - - - - - - - 0x8 - - - - - - - - 0 - - - - - - - - - - - - - - - - - - - - - rtf:BCHUPE @@ -4508,56 +4043,10 @@ - - - - - - - - - auto redefine style when appropriate - - - - - - - - 0xa - - - - - - - - 0 - - - - - - - - 0001 - - - - - - - - :1 - - - - - rtf:FAUTOREDEF @@ -4566,56 +4055,10 @@ - - - - - - - - - hidden from UI? - - - - - - - - 0xa - - - - - - - - 1 - - - - - - - - 0002 - - - - - - - - :1 - - - - - rtf:FHIDDEN @@ -4624,56 +4067,10 @@ - - - - - - - - - unused bits - - - - - - - - 0xa - - - - - - - - 2 - - - - - - - - FFFC - - - - - - - - :14 - - - - - rtf:UNUSED8_3 @@ -4682,12 +4079,6 @@ - - - - - - @@ -4700,16 +4091,6 @@ - - - - - - - - - - @@ -4720,16 +4101,6 @@ - - - - - - - - - - @@ -4740,19 +4111,6 @@ - - - - - - - - - - - - - @@ -4763,27 +4121,9 @@ - - - - - - - - - - - - - - - - - -