diff options
22 files changed, 13 insertions, 72 deletions
diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx index ebe093128f10..af08bcb1a7ee 100644 --- a/lotuswordpro/source/filter/bento.hxx +++ b/lotuswordpro/source/filter/bento.hxx @@ -273,7 +273,6 @@ public: // Internal methods inline pCBenValueSegment GetNextValueSegment(pCBenValueSegment pCurrValueSegment); - inline pLtcBenContainer GetContainer(); CUtList& GetValueSegments() { return cValueSegments; } private: // Data @@ -337,8 +336,6 @@ inline pCBenValueSegment CBenValue::GetNextValueSegment(pCBenValueSegment pCurrValueSegment) { return static_cast<pCBenValueSegment>( cValueSegments.GetNextOrNULL(pCurrValueSegment) ); } -inline pLtcBenContainer CBenValue::GetContainer() -{ return GetProperty()->GetContainer(); } class CBenNamedObject : public CBenObject { diff --git a/lotuswordpro/source/filter/benval.cxx b/lotuswordpro/source/filter/benval.cxx index 6cffe1d9c41d..6899a2a051f3 100644 --- a/lotuswordpro/source/filter/benval.cxx +++ b/lotuswordpro/source/filter/benval.cxx @@ -76,7 +76,7 @@ CBenValue::ReadValueData(void * pReadBuffer, unsigned long Offset, unsigned long SegOffset = 0; *pAmtRead = 0; pCBenValueSegment pCurrSeg = nullptr; - pLtcBenContainer pContainer = GetContainer(); + pLtcBenContainer pContainer = GetProperty()->GetContainer(); BenByte* pBuffer = static_cast<BenByte*>(pReadBuffer); /// pReadBuffer -- pointer to buffer of read result, allocated outside this function diff --git a/lotuswordpro/source/filter/lwpfrib.cxx b/lotuswordpro/source/filter/lwpfrib.cxx index 64f49eecef2a..737985cacd49 100644 --- a/lotuswordpro/source/filter/lwpfrib.cxx +++ b/lotuswordpro/source/filter/lwpfrib.cxx @@ -204,8 +204,8 @@ LwpFrib* LwpFrib::CreateFrib(LwpPara* pPara, LwpObjectStream* pObjStrm, sal_uInt newFrib->SetModifiers(pModInfo); } - newFrib->SetType(fribtype); - newFrib->SetEditor(editID); + newFrib->m_nFribType = fribtype; + newFrib->m_nEditor = editID; newFrib->Read(pObjStrm, friblen); return newFrib; } diff --git a/lotuswordpro/source/filter/lwpfrib.hxx b/lotuswordpro/source/filter/lwpfrib.hxx index 509ea1e4d402..d4a1078210cd 100644 --- a/lotuswordpro/source/filter/lwpfrib.hxx +++ b/lotuswordpro/source/filter/lwpfrib.hxx @@ -93,8 +93,6 @@ public: LwpFrib* GetNext(){return m_pNext;} void SetNext(LwpFrib* next){m_pNext = next;} sal_uInt8 GetType() { return m_nFribType;} - void SetType(sal_uInt8 type) { m_nFribType = type;} - void SetEditor(sal_uInt8 editor) { m_nEditor = editor;} OUString GetEditor(); XFColor GetHighlightColor(); protected: diff --git a/lotuswordpro/source/filter/lwpfribmark.hxx b/lotuswordpro/source/filter/lwpfribmark.hxx index c9803a7b3989..da2ee48552d8 100644 --- a/lotuswordpro/source/filter/lwpfribmark.hxx +++ b/lotuswordpro/source/filter/lwpfribmark.hxx @@ -77,7 +77,6 @@ public: virtual ~LwpFribCHBlock() override {} void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override; LwpCHBlkMarker* GetMarker(); - sal_uInt8 GetType(){return m_nType;} enum{MARKER_START=1,MARKER_END,MARKER_NONE}; void XFConvert(XFContentContainer* pXFPara,LwpStory* pStory); private: @@ -151,7 +150,6 @@ public: virtual ~LwpFribRubyMarker() override {} void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override; LwpRubyMarker* GetMarker(); - sal_uInt8 GetType(){return m_nType;} enum{MARKER_START=1,MARKER_END,MARKER_NONE}; void XFConvert(XFContentContainer* pXFPara); void RegisterStyle(LwpFoundry* pFoundry) override; diff --git a/lotuswordpro/source/filter/lwpfribsection.cxx b/lotuswordpro/source/filter/lwpfribsection.cxx index 2d992f1d31fc..6e1b41729be9 100644 --- a/lotuswordpro/source/filter/lwpfribsection.cxx +++ b/lotuswordpro/source/filter/lwpfribsection.cxx @@ -382,7 +382,7 @@ void LwpMasterPage::ParseSection(LwpFrib* pFrib) if(m_pLayout->HasFillerPageText(m_pPara->GetFoundry())) { XFParagraph *pPara = new XFParagraph(); - pPara->SetStyleName(GetFillerPageStyleName()); + pPara->SetStyleName(m_FillerPageStyleName); m_pPara->AddXFContent(pPara); rFribPtr.SetXFPara(pPara); @@ -419,7 +419,7 @@ void LwpMasterPage::ParseSection(LwpFrib* pFrib) if(pFrib->HasNextFrib()) { XFParagraph *pNextPara = new XFParagraph(); - pNextPara->SetStyleName(GetStyleName()); + pNextPara->SetStyleName(m_StyleName); m_pPara->AddXFContent(pNextPara); rFribPtr.SetXFPara(pNextPara); } diff --git a/lotuswordpro/source/filter/lwpfribsection.hxx b/lotuswordpro/source/filter/lwpfribsection.hxx index aa6c0f88cfe2..4ce9371bdfdb 100644 --- a/lotuswordpro/source/filter/lwpfribsection.hxx +++ b/lotuswordpro/source/filter/lwpfribsection.hxx @@ -81,8 +81,6 @@ public: void ParseSection(LwpFrib* pFrib); XFSection* CreateXFSection(); - const OUString& GetStyleName(){ return m_StyleName;} - const OUString& GetFillerPageStyleName(){ return m_FillerPageStyleName;} bool IsNextPageType(); private: diff --git a/lotuswordpro/source/filter/lwpobjfactory.cxx b/lotuswordpro/source/filter/lwpobjfactory.cxx index d2bbaa353b4d..fa4faf1f3e68 100644 --- a/lotuswordpro/source/filter/lwpobjfactory.cxx +++ b/lotuswordpro/source/filter/lwpobjfactory.cxx @@ -105,18 +105,9 @@ LwpObjectFactory::LwpObjectFactory(LwpSvStream* pSvStream) LwpObjectFactory::~LwpObjectFactory() { - if(!m_IdToObjList.empty()) - ClearObjectMap(); } /** - * @descr clear object map and delete all objects -*/ -void LwpObjectFactory::ClearObjectMap() -{ - m_IdToObjList.clear(); -} -/** * @descr read the index manager */ void LwpObjectFactory::ReadIndex(LwpSvStream* pStrm) diff --git a/lotuswordpro/source/filter/lwpobjfactory.hxx b/lotuswordpro/source/filter/lwpobjfactory.hxx index ca7258c35dee..f28228987f72 100644 --- a/lotuswordpro/source/filter/lwpobjfactory.hxx +++ b/lotuswordpro/source/filter/lwpobjfactory.hxx @@ -105,7 +105,6 @@ private: typedef std::unordered_map<LwpObjectID, rtl::Reference<LwpObject>, hashFunc, eqFunc> LwpIdToObjMap; LwpIdToObjMap m_IdToObjList; LwpIndexManager m_IndexMgr; - void ClearObjectMap(); protected: rtl::Reference<LwpObject> FindObject(const LwpObjectID &objID); diff --git a/lotuswordpro/source/filter/lwppara.hxx b/lotuswordpro/source/filter/lwppara.hxx index 16cdc49c4a8b..7fc270afd1dd 100644 --- a/lotuswordpro/source/filter/lwppara.hxx +++ b/lotuswordpro/source/filter/lwppara.hxx @@ -175,8 +175,6 @@ public: OUString const & GetContentText(bool bAllText = false); void SetParaDropcap(bool bFlag); - void SetDropcapLines(sal_uInt16 number); - void SetDropcapChars(sal_uInt32 chars); void SetDropcapLayout(LwpDropcapLayout* pLayout); XFContentContainer* GetXFContainer(); @@ -186,7 +184,6 @@ public: void RegisterTabStyle(XFParaStyle* pXFParaStyle); LwpBulletStyleMgr* GetBulletStyleMgr(); - sal_uInt32 GetOrdinal(){ return m_nOrdinal;} bool operator <(LwpPara& Other); bool ComparePagePosition(LwpVirtualLayout* pPreLayout, LwpVirtualLayout* pNextLayout); @@ -351,14 +348,6 @@ inline void LwpPara::SetParaDropcap(bool bFlag) { m_bHasDropcap = bFlag; } -inline void LwpPara::SetDropcapLines(sal_uInt16 number) -{ - m_nLines = number; -} -inline void LwpPara::SetDropcapChars(sal_uInt32 chars) -{ - m_nChars = chars; -} inline void LwpPara::SetDropcapLayout(LwpDropcapLayout* pLayout) { m_pDropcapLayout = pLayout; diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx index 58436d090809..0923312d6ea8 100644 --- a/lotuswordpro/source/filter/lwppara1.cxx +++ b/lotuswordpro/source/filter/lwppara1.cxx @@ -100,6 +100,7 @@ #include "lwpdropcapmgr.hxx" #include "lwptable.hxx" #include "lwpcelllayout.hxx" +#include "lwpframelayout.hxx" // boost::polymorphic_downcast checks and reports (using assert), if the // cast is incorrect (in debug builds). @@ -148,11 +149,10 @@ XFParaStyle* LwpPara::GetXFParaStyle() /** * @short get drop cap info */ -#include "lwpframelayout.hxx" void LwpPara::GatherDropcapInfo() { - SetDropcapLines(m_pDropcapLayout->GetLines()); - SetDropcapChars(m_pDropcapLayout->GetChars()); + m_nLines = m_pDropcapLayout->GetLines(); + m_nChars = m_pDropcapLayout->GetChars(); } /** * @short get parent paragraph @@ -593,7 +593,7 @@ LwpTabOverride* LwpPara::GetLocalTabOverride() */ bool LwpPara::operator< (LwpPara& Other) { - return m_nOrdinal < Other.GetOrdinal(); + return m_nOrdinal < Other.m_nOrdinal; } /** diff --git a/lotuswordpro/source/filter/lwpprtinfo.cxx b/lotuswordpro/source/filter/lwpprtinfo.cxx index ee6a6a07d015..bd793aab1b00 100644 --- a/lotuswordpro/source/filter/lwpprtinfo.cxx +++ b/lotuswordpro/source/filter/lwpprtinfo.cxx @@ -57,14 +57,6 @@ LwpPrinterInfo::LwpPrinterInfo(LwpObjectStream* pStrm) { - Read(pStrm); -} -/** - * @descr read printer info in VO_DOCUMENT - */ -void LwpPrinterInfo::Read(LwpObjectStream* pStrm) -{ - //Just skip now Skip(pStrm); } /** diff --git a/lotuswordpro/source/filter/lwpprtinfo.hxx b/lotuswordpro/source/filter/lwpprtinfo.hxx index 2b490c104498..bed62647386d 100644 --- a/lotuswordpro/source/filter/lwpprtinfo.hxx +++ b/lotuswordpro/source/filter/lwpprtinfo.hxx @@ -74,7 +74,6 @@ public: ~LwpPrinterInfo(){} public: - static void Read(LwpObjectStream* pStrm); static void Skip(LwpObjectStream *pStrm); }; #endif diff --git a/lotuswordpro/source/filter/lwptaboverride.hxx b/lotuswordpro/source/filter/lwptaboverride.hxx index 9cfc24258fdb..4ebac3cd72fc 100644 --- a/lotuswordpro/source/filter/lwptaboverride.hxx +++ b/lotuswordpro/source/filter/lwptaboverride.hxx @@ -90,7 +90,6 @@ public: inline LwpObjectID& GetTabRackID(); inline bool IsTabRackOverridden(); inline void Override(LwpTabOverride* pOther); - inline void OverrideTabRack(LwpObjectID* pTabRackID); protected: LwpTabOverride(LwpTabOverride const& rOther); @@ -117,7 +116,7 @@ inline void LwpTabOverride::Override(LwpTabOverride* pOther) { if (IsTabRackOverridden()) //m_aTabRackID = *(pOther->GetTabRackID()); - pOther->OverrideTabRack(&GetTabRackID()); + pOther->m_aTabRackID = GetTabRackID(); } } @@ -126,10 +125,6 @@ inline bool LwpTabOverride::IsTabRackOverridden() return (m_nOverride & TO_TABRACK) != 0; } -inline void LwpTabOverride::OverrideTabRack(LwpObjectID* pTabRackID) -{ - m_aTabRackID = *pTabRackID; -} #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwptblcell.cxx b/lotuswordpro/source/filter/lwptblcell.cxx index 249d6101cb8d..8f031af7dbc3 100644 --- a/lotuswordpro/source/filter/lwptblcell.cxx +++ b/lotuswordpro/source/filter/lwptblcell.cxx @@ -102,7 +102,7 @@ void LwpCellList::Parse(IXFStream* /*pOutputStream*/) void LwpCellList::Convert(XFCell * pCell, LwpTableLayout* /*pCellsMap*/) { - LwpObjectID aValueID = GetValueID(); + LwpObjectID aValueID = cValue; LwpNumericValue* pValue = dynamic_cast<LwpNumericValue*>(aValueID.obj().get()); if (pValue) { diff --git a/lotuswordpro/source/filter/lwptblcell.hxx b/lotuswordpro/source/filter/lwptblcell.hxx index ef105d3edc69..39f5ab8420d6 100644 --- a/lotuswordpro/source/filter/lwptblcell.hxx +++ b/lotuswordpro/source/filter/lwptblcell.hxx @@ -84,7 +84,6 @@ public: virtual void Parse(IXFStream* pOutputStream) override; LwpObjectID GetNextID(){return GetNext();} sal_uInt8 GetColumnID(){return cColumn;} - const LwpObjectID& GetValueID(){return cValue;} virtual void Convert(XFCell * pCell, LwpTableLayout* pCellsMap=nullptr); protected: diff --git a/lotuswordpro/source/filter/utlist.cxx b/lotuswordpro/source/filter/utlist.cxx index a31fbede669a..6c6afdedcc8e 100644 --- a/lotuswordpro/source/filter/utlist.cxx +++ b/lotuswordpro/source/filter/utlist.cxx @@ -68,7 +68,7 @@ CUtListElmt::CUtListElmt(pCUtList pList) CUtListElmt::~CUtListElmt() { - if (OnList()) + if (cpNext != nullptr) { cpPrev->cpNext = cpNext; cpNext->cpPrev = cpPrev; diff --git a/lotuswordpro/source/filter/utlist.hxx b/lotuswordpro/source/filter/utlist.hxx index 9f1b0372e386..f30bd5df8d63 100644 --- a/lotuswordpro/source/filter/utlist.hxx +++ b/lotuswordpro/source/filter/utlist.hxx @@ -75,7 +75,6 @@ public: // Methods explicit CUtListElmt(pCUtListElmt pPrev) { InsertAfter(pPrev); } explicit CUtListElmt(pCUtList pList); virtual ~CUtListElmt(); - bool OnList() { return cpNext != nullptr; } void MakeNotOnList() { cpNext = nullptr; } // Same as Remove but doesn't // patch up list pCUtListElmt GetNext() const { return cpNext; } diff --git a/lotuswordpro/source/filter/xfilter/xffontfactory.cxx b/lotuswordpro/source/filter/xfilter/xffontfactory.cxx index af9fd504e744..3cf282e98c74 100644 --- a/lotuswordpro/source/filter/xfilter/xffontfactory.cxx +++ b/lotuswordpro/source/filter/xfilter/xffontfactory.cxx @@ -65,12 +65,6 @@ XFFontFactory::XFFontFactory() XFFontFactory::~XFFontFactory() { - Reset(); -} - -void XFFontFactory::Reset() -{ - s_aFonts.clear(); } void XFFontFactory::AddFont(rtl::Reference<XFFont> const & pFont) diff --git a/lotuswordpro/source/filter/xfilter/xffontfactory.hxx b/lotuswordpro/source/filter/xfilter/xffontfactory.hxx index 33baf5cade35..fc074010afa4 100644 --- a/lotuswordpro/source/filter/xfilter/xffontfactory.hxx +++ b/lotuswordpro/source/filter/xfilter/xffontfactory.hxx @@ -81,12 +81,6 @@ public: ~XFFontFactory(); XFFontFactory(const XFFontFactory&){} -public: - /** - * @descr Clear all fonts, this is called when load a file. - */ - void Reset(); - private: /** * @descr Add a font. if there exist a font with same properties with pFont, them the font object diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx index bd1367bab7fa..d6e1763e86af 100644 --- a/package/inc/ZipPackageStream.hxx +++ b/package/inc/ZipPackageStream.hxx @@ -77,7 +77,6 @@ private: throw(css::uno::RuntimeException); public: - bool IsEncrypted () const { return m_bIsEncrypted;} bool IsPackageMember () const { return m_nStreamMode == PACKAGE_STREAM_PACKAGEMEMBER;} bool IsFromManifest() const { return m_bFromManifest; } diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx index 45d1dcb9be56..90fb399379b3 100644 --- a/package/source/zippackage/ZipPackageStream.cxx +++ b/package/source/zippackage/ZipPackageStream.cxx @@ -920,7 +920,7 @@ void ZipPackageStream::successfullyWritten( ZipEntry *pEntry ) ZipPackageFolder::copyZipEntry( aEntry, *pEntry ); // TODO/LATER: get rid of this hack ( the encrypted stream size property is changed during saving ) - if ( IsEncrypted() ) + if ( m_bIsEncrypted ) setSize( m_nOwnStreamOrigSize ); aEntry.nOffset *= -1; |