From 0f732c41bc4edd7075ff68a81c0ca299e3e913c9 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 17 Jul 2015 11:48:35 +0200 Subject: loplugin:unusedmethods lotuswordpro Change-Id: I17927d48a75c332f1ddc3853145b14daac17f9c0 --- lotuswordpro/source/filter/benname.cxx | 9 -- lotuswordpro/source/filter/benobj.cxx | 8 +- lotuswordpro/source/filter/bento.hxx | 40 ------- lotuswordpro/source/filter/lwp9reader.cxx | 24 ---- lotuswordpro/source/filter/lwp9reader.hxx | 36 +++--- lotuswordpro/source/filter/lwpbreaksoverride.hxx | 6 - lotuswordpro/source/filter/lwpbulletstylemgr.cxx | 1 - lotuswordpro/source/filter/lwpbulletstylemgr.hxx | 31 ----- lotuswordpro/source/filter/lwpcelllayout.hxx | 6 +- .../source/filter/lwpcharborderoverride.hxx | 98 ---------------- lotuswordpro/source/filter/lwpdivinfo.hxx | 1 - lotuswordpro/source/filter/lwpdoc.hxx | 5 - lotuswordpro/source/filter/lwpdrawobj.hxx | 6 - lotuswordpro/source/filter/lwpfootnote.hxx | 8 -- lotuswordpro/source/filter/lwpfoundry.hxx | 1 - lotuswordpro/source/filter/lwpframelayout.hxx | 12 +- lotuswordpro/source/filter/lwpfrib.hxx | 3 - lotuswordpro/source/filter/lwpfribptr.hxx | 3 - lotuswordpro/source/filter/lwpfribsection.hxx | 4 +- lotuswordpro/source/filter/lwpfribtext.hxx | 6 - lotuswordpro/source/filter/lwpgrfobj.hxx | 2 - lotuswordpro/source/filter/lwpholder.hxx | 1 - lotuswordpro/source/filter/lwplayout.hxx | 2 - lotuswordpro/source/filter/lwplaypiece.hxx | 13 --- .../source/filter/lwpnumberingoverride.hxx | 50 -------- lotuswordpro/source/filter/lwpnumericfmt.hxx | 8 -- lotuswordpro/source/filter/lwpobj.hxx | 1 - lotuswordpro/source/filter/lwpobjid.hxx | 17 +-- lotuswordpro/source/filter/lwpobjstrm.hxx | 2 - lotuswordpro/source/filter/lwppagehint.hxx | 2 - lotuswordpro/source/filter/lwppara.hxx | 22 ---- lotuswordpro/source/filter/lwpparaproperty.hxx | 6 - lotuswordpro/source/filter/lwpsection.hxx | 30 ----- lotuswordpro/source/filter/lwpsilverbullet.hxx | 26 +---- lotuswordpro/source/filter/lwpslvlist.hxx | 3 - lotuswordpro/source/filter/lwpstory.hxx | 5 - lotuswordpro/source/filter/lwptablelayout.cxx | 15 --- lotuswordpro/source/filter/lwptablelayout.hxx | 1 - lotuswordpro/source/filter/lwptabrack.hxx | 5 - lotuswordpro/source/filter/lwptblcell.hxx | 126 --------------------- lotuswordpro/source/filter/lwptblformula.hxx | 2 - lotuswordpro/source/filter/lwptools.hxx | 11 -- lotuswordpro/source/filter/utlist.hxx | 8 -- lotuswordpro/source/filter/xfilter/ixfstyle.hxx | 5 - lotuswordpro/source/filter/xfilter/xfcell.hxx | 46 ++------ lotuswordpro/source/filter/xfilter/xfcellstyle.hxx | 9 -- lotuswordpro/source/filter/xfilter/xfchange.hxx | 5 - lotuswordpro/source/filter/xfilter/xfcolor.hxx | 15 --- lotuswordpro/source/filter/xfilter/xfdate.hxx | 32 ------ lotuswordpro/source/filter/xfilter/xfdatestyle.hxx | 48 -------- lotuswordpro/source/filter/xfilter/xfdrawobj.hxx | 59 ++-------- .../source/filter/xfilter/xfdrawpolyline.hxx | 6 - lotuswordpro/source/filter/xfilter/xfdrawrect.hxx | 21 ---- lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx | 11 -- lotuswordpro/source/filter/xfilter/xfendnote.hxx | 9 -- lotuswordpro/source/filter/xfilter/xfentry.hxx | 30 ----- lotuswordpro/source/filter/xfilter/xffont.hxx | 88 +------------- .../source/filter/xfilter/xffontworkstyle.hxx | 36 +----- lotuswordpro/source/filter/xfilter/xffootnote.hxx | 9 -- .../source/filter/xfilter/xffootnoteconfig.hxx | 42 ------- lotuswordpro/source/filter/xfilter/xfframe.hxx | 12 -- .../source/filter/xfilter/xfframestyle.hxx | 10 -- lotuswordpro/source/filter/xfilter/xfhyperlink.hxx | 14 --- .../source/filter/xfilter/xfimagestyle.hxx | 45 -------- lotuswordpro/source/filter/xfilter/xfindex.hxx | 9 -- .../source/filter/xfilter/xflineheight.hxx | 7 -- .../source/filter/xfilter/xflinenumberconfig.hxx | 29 ----- lotuswordpro/source/filter/xfilter/xfmargins.hxx | 12 -- .../source/filter/xfilter/xfnumberstyle.hxx | 30 +---- .../source/filter/xfilter/xfpagemaster.hxx | 7 -- lotuswordpro/source/filter/xfilter/xfparastyle.hxx | 54 --------- lotuswordpro/source/filter/xfilter/xfrowstyle.hxx | 6 - lotuswordpro/source/filter/xfilter/xfstyle.cxx | 5 - lotuswordpro/source/filter/xfilter/xfstyle.hxx | 5 - lotuswordpro/source/filter/xfilter/xftable.hxx | 23 ---- .../source/filter/xfilter/xftablestyle.hxx | 21 ---- 76 files changed, 51 insertions(+), 1375 deletions(-) (limited to 'lotuswordpro') diff --git a/lotuswordpro/source/filter/benname.cxx b/lotuswordpro/source/filter/benname.cxx index b8ecab7399a7..3a299ef44f89 100644 --- a/lotuswordpro/source/filter/benname.cxx +++ b/lotuswordpro/source/filter/benname.cxx @@ -63,25 +63,16 @@ CBenNamedObject::CBenNamedObject(pLtcBenContainer pContainer, : CBenObject(pContainer, ObjectID, pPrevObject) , csName(sName) , cNameListElmt(pPrevNamedObjectListElmt) - , cPos(0) { cNameListElmt.SetNamedObject(this); } -bool CBenNamedObject::IsNamedObject() -{ return true; } - bool CBenNamedObject::IsPropertyName() { return false; } -bool CBenNamedObject::IsTypeName() -{ return false; } - bool CBenPropertyName::IsPropertyName() { return true; } -bool CBenTypeName::IsTypeName() -{ return true; } } // end namespace OpenStormBento /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/benobj.cxx b/lotuswordpro/source/filter/benobj.cxx index 3bba37acf011..8b5d2d574d3a 100644 --- a/lotuswordpro/source/filter/benobj.cxx +++ b/lotuswordpro/source/filter/benobj.cxx @@ -53,15 +53,11 @@ * * ************************************************************************/ + #include "first.hxx" -namespace OpenStormBento -{ -bool -CBenObject::IsNamedObject() +namespace OpenStormBento { - return false; -} pCBenProperty CBenObject::UseProperty(BenObjectID PropertyID) diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx index cf2f2ac2f2d8..6ecc65aa0eee 100644 --- a/lotuswordpro/source/filter/bento.hxx +++ b/lotuswordpro/source/filter/bento.hxx @@ -220,7 +220,6 @@ public: // Internal methods BenError SeekToPosition(BenContainerPos Pos); BenError SeekFromEnd(long Offset); - BenObjectID GetNextAvailObjectID() { return cNextAvailObjectID; } void SetNextAvailObjectID(BenObjectID ID) { cNextAvailObjectID = ID; } CUtList& GetObjects() { return cObjects; } CUtList& GetNamedObjects() { return cNamedObjects; } @@ -230,10 +229,6 @@ public: // Internal methods BenError CreateGraphicStream(SvStream * &pStream, const char *pObjectName); BenError GetSize(sal_uLong * pLength); - LwpSvStream * GetStream() - { - return cpStream; - }; private: // Data CUtOwningList cObjects; CUtList cNamedObjects; @@ -247,9 +242,7 @@ class CBenObject : public CBenIDListElmt public: pCBenProperty UseProperty(BenObjectID PropertyID); pCBenValue UseValue(BenObjectID PropertyID); - virtual bool IsNamedObject(); pLtcBenContainer GetContainer() { return cpContainer; } - BenObjectID GetObjectID() { return GetID(); } public: // Internal methods CBenObject(pLtcBenContainer pContainer, BenObjectID ObjectID, pCUtListElmt pPrev) : CBenIDListElmt(ObjectID, pPrev) @@ -289,7 +282,6 @@ public: // Internal methods cpProperty = pProperty; cpReferencedList = NULL; } - BenObjectID GetTypeNameID() { return GetID(); } inline pCBenValueSegment GetNextValueSegment(pCBenValueSegment pCurrValueSegment); inline pLtcBenContainer GetContainer(); @@ -321,27 +313,11 @@ public: // Internal methods cpObject = pObject; cValue.SetProperty(this); } - -BenObjectID GetPropertyNameID() { return GetID(); } - private: // Data pCBenObject cpObject; CBenValue cValue; }; -// In our implementation, reference is always just the object ID for the -// object referenced (but you shouldn't assume that) -#define BEN_REFERENCE_SIZE 4 - -class CBenReference -{ -public: // Methods - BenByte * GetData() { return cData; } - -private: // Data - BenByte cData[BEN_REFERENCE_SIZE]; -}; - class CBenValueSegment : public CUtListElmt { public: // Internal methods @@ -359,15 +335,9 @@ public: // Internal methods CBenValueSegment(const void * pImmData, unsigned short Size) { cpValue = NULL; cImmediate = true; UtHugeMemcpy(cImmData, pImmData, Size); cSize = Size; } - bool IsLast() - { - return cpValue == NULL || cpValue->GetValueSegments().GetLast() == - this; - } bool IsImmediate() { return cImmediate; } BenContainerPos GetPosition() { return cPos; } unsigned long GetSize() { return cSize; } - void SetSize(unsigned long Size) { cSize = Size; } BenByte * GetImmediateData() { return cImmData; } private: // Data @@ -391,27 +361,18 @@ inline pLtcBenContainer CBenValue::GetContainer() class CBenNamedObject : public CBenObject { public: // Methods - virtual bool IsNamedObject() SAL_OVERRIDE; virtual bool IsPropertyName(); - virtual bool IsTypeName(); public: // Internal methods CBenNamedObject(pLtcBenContainer pContainer, BenObjectID ObjectID, pCBenObject pPrevObject, const char * sName, pCUtListElmt pPrevNamedObjectListElmt); - const char * GetName() { return csName.data(); } const char * GetNameCStr() { return csName.c_str(); } - void SetPosition(BenContainerPos Pos) { cPos = Pos; } - BenContainerPos GetPosition() { return cPos; } - size_t GetLength() { return csName.length()+ 1; } - CBenNamedObjectListElmt& GetNameListElmt() { return cNameListElmt; } - private: // Data std::string csName; CBenNamedObjectListElmt cNameListElmt; - BenContainerPos cPos; }; class CBenPropertyName : public CBenNamedObject @@ -433,7 +394,6 @@ public: // Internal methods pCUtListElmt pPrevNamedObjectListElmt) : CBenNamedObject(pContainer, ObjectID, pPrevObject, sName, pPrevNamedObjectListElmt) { ; } - virtual bool IsTypeName() SAL_OVERRIDE; }; } // end namespace OpenStormBento diff --git a/lotuswordpro/source/filter/lwp9reader.cxx b/lotuswordpro/source/filter/lwp9reader.cxx index f23c8fcbd076..991c1e1eb154 100644 --- a/lotuswordpro/source/filter/lwp9reader.cxx +++ b/lotuswordpro/source/filter/lwp9reader.cxx @@ -133,31 +133,7 @@ void Lwp9Reader::ReadIndex() * This function is replaced by the read on demand model * Reserverd for future use */ -void Lwp9Reader::DumpAllObjects() -{ - sal_Int64 nFileSize = GetFileSize(); - sal_Int64 nFilePos = m_pDocStream->Tell(); - while(true) - { - LwpObjectHeader objHdr; - objHdr.Read(*m_pDocStream); - nFilePos = m_pDocStream->Tell(); - //Stop when reaching the index object - if(objHdr.GetTag() >= VO_ROOTLEAFOBJINDEX) - { - break; - } - //Stop when the length exceeds the file length - if(nFilePos + objHdr.GetSize() > nFileSize) - { - assert(false); - break; - } - m_pObjMgr->CreateObject(objHdr.GetTag(), objHdr); - m_pDocStream->Seek(nFilePos+objHdr.GetSize()); - } -} /** * @descr Get file size diff --git a/lotuswordpro/source/filter/lwp9reader.hxx b/lotuswordpro/source/filter/lwp9reader.hxx index 30583939ac5e..ecf175d8e6c0 100644 --- a/lotuswordpro/source/filter/lwp9reader.hxx +++ b/lotuswordpro/source/filter/lwp9reader.hxx @@ -61,29 +61,29 @@ #include "lwpfilehdr.hxx" #include "lwpobjfactory.hxx" #include "xfilter/ixfstream.hxx" + /** * @brief Reader framework class for Lotus Word Pro 9 file */ class Lwp9Reader { - public: - Lwp9Reader(LwpSvStream* InputStream, IXFStream* pStream); - ~Lwp9Reader(){} - private: - LwpSvStream* m_pDocStream; - IXFStream* m_pStream; - LwpObjectFactory* m_pObjMgr; - LwpFileHeader m_LwpFileHdr; //LWP7 object - protected: - sal_Int64 GetFileSize(); - void ReadFileHeader(); - void ReadIndex(); - void DumpAllObjects(); - void ParseDocument(); - void WriteDocHeader(); - void WriteDocEnd(); - public: - void Read(); +public: + Lwp9Reader(LwpSvStream* InputStream, IXFStream* pStream); + ~Lwp9Reader(){} +private: + LwpSvStream* m_pDocStream; + IXFStream* m_pStream; + LwpObjectFactory* m_pObjMgr; + LwpFileHeader m_LwpFileHdr; //LWP7 object +protected: + sal_Int64 GetFileSize(); + void ReadFileHeader(); + void ReadIndex(); + void ParseDocument(); + void WriteDocHeader(); + void WriteDocEnd(); +public: + void Read(); }; #endif diff --git a/lotuswordpro/source/filter/lwpbreaksoverride.hxx b/lotuswordpro/source/filter/lwpbreaksoverride.hxx index 1454afc1bb4f..69eb74269fd1 100644 --- a/lotuswordpro/source/filter/lwpbreaksoverride.hxx +++ b/lotuswordpro/source/filter/lwpbreaksoverride.hxx @@ -127,7 +127,6 @@ public: void OverrideKeepWithPrevious(bool bVal); void OverrideUseNextStyle(bool bVal); - inline LwpAtomHolder* GetNextStyle(); //end add protected: @@ -240,11 +239,6 @@ inline void LwpBreaksOverride::RevertUseNextStyle() LwpOverride::Override(BO_USENEXTSTYLE, STATE_STYLE); } -inline LwpAtomHolder* LwpBreaksOverride::GetNextStyle() -{ - return m_pNextStyle; -} - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx index 0af56ef2782f..7a9c879aef08 100644 --- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx +++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx @@ -79,7 +79,6 @@ LwpBulletStyleMgr::LwpBulletStyleMgr() , m_pBulletList(NULL) , m_bContinue(true) , m_bIsBulletSkipped(false) - , m_nCurrentPos(0xFF) { } diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx index 8b5b8acad2e4..d426434b3a70 100644 --- a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx +++ b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx @@ -90,12 +90,7 @@ public: inline void SetContinueFlag(bool bFlag); XFContentContainer* AddBulletList(XFContentContainer* pCont, bool bIsOrdered, const OUString& rStyleName, sal_Int16 nLevel, bool bIsBulletSkiped); - inline void SetCurrentPos(sal_uInt16 nNewPos); inline void SetCurrentSilverBullet(const LwpObjectID& rNewID); - inline LwpObjectID GetCurrentSilverBullet(); - inline sal_uInt16 GetCurrentPos() const; - inline void SetCurrentNumOver(const LwpNumberingOverride& rOther); - inline LwpNumberingOverride* GetCurrentNumOver(); private: typedef std::pair, LwpObjectID> OverridePair; @@ -107,8 +102,6 @@ private: bool m_bIsBulletSkipped; LwpObjectID m_aCurrentNumberingID; boost::scoped_ptr m_pCurrentNumOverride; - sal_uInt16 m_nCurrentPos; - }; inline void LwpBulletStyleMgr::SetFoundry(LwpFoundry* pFoundry) @@ -119,35 +112,11 @@ inline void LwpBulletStyleMgr::SetContinueFlag(bool bFlag) { m_bContinue = bFlag; } - -inline void LwpBulletStyleMgr::SetCurrentPos(sal_uInt16 nNewPos) -{ - m_nCurrentPos = nNewPos; -} inline void LwpBulletStyleMgr::SetCurrentSilverBullet(const LwpObjectID& rNewID) { m_aCurrentNumberingID = rNewID; } -inline LwpObjectID LwpBulletStyleMgr::GetCurrentSilverBullet() -{ - return m_aCurrentNumberingID; -} - -inline sal_uInt16 LwpBulletStyleMgr::GetCurrentPos() const -{ - return m_nCurrentPos; -} - -inline void LwpBulletStyleMgr::SetCurrentNumOver(const LwpNumberingOverride& rOther) -{ - m_pCurrentNumOverride.reset(rOther.clone()); -} -inline LwpNumberingOverride* LwpBulletStyleMgr::GetCurrentNumOver() -{ - return m_pCurrentNumOverride.get(); -} - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpcelllayout.hxx b/lotuswordpro/source/filter/lwpcelllayout.hxx index 1ca533ad8d60..1a09d8bd8c14 100644 --- a/lotuswordpro/source/filter/lwpcelllayout.hxx +++ b/lotuswordpro/source/filter/lwpcelllayout.hxx @@ -137,8 +137,6 @@ protected: OUString m_CellStyleNames[enumCellBorderTopLimit]; OUString m_NumfmtName;//Add to support number color -private: - LwpCellList* GetCellList(LwpFoundry* pFoundry, LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt8 nCol); }; /** @@ -176,14 +174,12 @@ public: sal_uInt8 GetNumcols(){return m_nRealcolspan;} virtual void SetCellMap() SAL_OVERRIDE; void SetNumrows(sal_uInt16 nVal){m_nRealrowspan = nVal;} - void SetNumcols(sal_uInt8 nVal){m_nRealcolspan = nVal;} protected: void Read() SAL_OVERRIDE; virtual sal_uInt16 GetBelowRowID(sal_uInt16 nRow) SAL_OVERRIDE {return nRow + m_nRealrowspan; }; virtual LwpCellBorderType GetCellBorderType(sal_uInt16 nRow, sal_uInt16 nCol, LwpTableLayout * pTableLayout) SAL_OVERRIDE; sal_uInt16 cnumrows; - sal_uInt8 cnumcols; -// sal_Bool m_bSplitFlag; + sal_uInt8 cnumcols; sal_uInt16 m_nRealrowspan; sal_uInt8 m_nRealcolspan; }; diff --git a/lotuswordpro/source/filter/lwpcharborderoverride.hxx b/lotuswordpro/source/filter/lwpcharborderoverride.hxx index 9beb601a5e72..1a1cb08f6dd9 100644 --- a/lotuswordpro/source/filter/lwpcharborderoverride.hxx +++ b/lotuswordpro/source/filter/lwpcharborderoverride.hxx @@ -80,26 +80,6 @@ public: void Read(LwpObjectStream* pStrm) SAL_OVERRIDE; - inline LwpBorderStuff* GetBorderStuff(); - inline LwpMargins* GetMargins(); - inline sal_Int32 GetAboveWidth() const; - inline sal_Int32 GetBelowWidth() const; - - inline bool IsBorderStuffOverridden(); - inline bool IsMarginsOverridden(); - inline bool IsAboveWidthOverridden(); - inline bool IsBelowWidthOverridden(); - - inline void OverrideBorderStuff(LwpBorderStuff* pOther); - inline void OverrideMargins(LwpMargins* pOther); - inline void OverrideAboveWidth(sal_Int32 nNewWidth); - inline void OverrideBelowWidth(sal_uInt32 nNewWidth); - - inline void RevertBorderStuff(); - inline void RevertMargins(); - inline void RevertAboveWidth(); - inline void RevertBelowWidth(); - protected: LwpCharacterBorderOverride(LwpCharacterBorderOverride const& rOther); @@ -121,84 +101,6 @@ private: }; }; -inline LwpMargins* LwpCharacterBorderOverride::GetMargins() -{ - return m_pMargins; -} - -inline LwpBorderStuff* LwpCharacterBorderOverride::GetBorderStuff() -{ - return m_pBorderStuff; -} - -inline sal_Int32 LwpCharacterBorderOverride::GetAboveWidth() const -{ - return m_nAboveWidth; -} - -inline sal_Int32 LwpCharacterBorderOverride::GetBelowWidth() const -{ - return m_nBelowWidth; -} - -inline bool LwpCharacterBorderOverride::IsBorderStuffOverridden() -{ - return ((m_nOverride & PBO_STUFF) != 0); -} - -inline bool LwpCharacterBorderOverride::IsMarginsOverridden() -{ - return ((m_nOverride & PBO_MARGINS) != 0); -} - -inline bool LwpCharacterBorderOverride::IsAboveWidthOverridden() -{ - return ((m_nOverride & PBO_ABOVE) != 0); -} - -inline bool LwpCharacterBorderOverride::IsBelowWidthOverridden() -{ - return ((m_nOverride & PBO_BELOW) != 0); -} - -inline void LwpCharacterBorderOverride::OverrideBorderStuff(LwpBorderStuff* pOther) -{ - m_pBorderStuff = pOther; - LwpOverride::Override(PBO_STUFF, STATE_ON); -} -inline void LwpCharacterBorderOverride::OverrideMargins(LwpMargins* pOther) -{ - m_pMargins = pOther; - LwpOverride::Override(PBO_MARGINS, STATE_ON); -} -inline void LwpCharacterBorderOverride::OverrideAboveWidth(sal_Int32 nNewWidth) -{ - m_nAboveWidth = nNewWidth; - LwpOverride::Override(PBO_ABOVE, STATE_ON); -} -inline void LwpCharacterBorderOverride::OverrideBelowWidth(sal_uInt32 nNewWidth) -{ - m_nBelowWidth = nNewWidth; - LwpOverride::Override(PBO_BELOW, STATE_ON); -} - -inline void LwpCharacterBorderOverride::RevertBorderStuff() -{ - LwpOverride::Override(PBO_STUFF, STATE_STYLE); -} -inline void LwpCharacterBorderOverride::RevertMargins() -{ - LwpOverride::Override(PBO_MARGINS, STATE_STYLE); -} -inline void LwpCharacterBorderOverride::RevertAboveWidth() -{ - LwpOverride::Override(PBO_ABOVE, STATE_STYLE); -} -inline void LwpCharacterBorderOverride::RevertBelowWidth() -{ - LwpOverride::Override(PBO_BELOW, STATE_STYLE); -} - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpdivinfo.hxx b/lotuswordpro/source/filter/lwpdivinfo.hxx index 6ac2fb503eca..813cfb1e6d9b 100644 --- a/lotuswordpro/source/filter/lwpdivinfo.hxx +++ b/lotuswordpro/source/filter/lwpdivinfo.hxx @@ -92,7 +92,6 @@ public: inline LwpDocument* GetDivision(); void GetNumberOfPages(sal_uInt16& nPageno); sal_uInt16 GetMaxNumberOfPages(); - LwpAtomHolder& GetExternalName() { return m_ExternalName; } protected: void Read() SAL_OVERRIDE; private: diff --git a/lotuswordpro/source/filter/lwpdoc.hxx b/lotuswordpro/source/filter/lwpdoc.hxx index 31b9338dbfc9..6816f8700fd8 100644 --- a/lotuswordpro/source/filter/lwpdoc.hxx +++ b/lotuswordpro/source/filter/lwpdoc.hxx @@ -138,7 +138,6 @@ public: inline bool IsChildDoc(); inline bool HonorProtection(); - inline LwpObjectID& GetContentList(); inline LwpObjectID& GetDocData(); inline LwpObjectID& GetSocket(); @@ -186,10 +185,6 @@ inline bool LwpDocument::HonorProtection() { return (m_nPersistentFlags & DOC_PROTECTED) != 0; } -inline LwpObjectID& LwpDocument::GetContentList() -{ - return m_pFoundry->GetContentManager().GetContentList(); -} inline LwpObjectID& LwpDocument::GetSocket() { return m_DocSockID; diff --git a/lotuswordpro/source/filter/lwpdrawobj.hxx b/lotuswordpro/source/filter/lwpdrawobj.hxx index 1b899a56fb4f..33e8eea701c1 100644 --- a/lotuswordpro/source/filter/lwpdrawobj.hxx +++ b/lotuswordpro/source/filter/lwpdrawobj.hxx @@ -139,12 +139,6 @@ public: * @descr set the type to the draw object. */ inline void SetObjectType(DrawObjectType eType) { m_eType = eType; } - - /** - * @descr get the type of the draw object. - * @return the type of the object. - */ - inline DrawObjectType GetObjectType() const { return m_eType; } }; /** diff --git a/lotuswordpro/source/filter/lwpfootnote.hxx b/lotuswordpro/source/filter/lwpfootnote.hxx index 7db29b5e7205..0da5d37b8587 100644 --- a/lotuswordpro/source/filter/lwpfootnote.hxx +++ b/lotuswordpro/source/filter/lwpfootnote.hxx @@ -225,13 +225,10 @@ public: HAS_SEPARATOR = 0x01, CUSTOM_LENGTH = 0x02 }; -public: - sal_uInt32 GetFlag(){ return m_nFlag;} sal_uInt32 GetLength(){ return m_nLength;} sal_uInt32 GetIndent(){ return m_nIndent;} sal_uInt32 GetAbove(){ return m_nAbove;} sal_uInt32 GetBelow(){ return m_nBelow;} - LwpBorderStuff& GetBorderStuff(){ return m_BorderStuff;} bool HasCustomLength(){ return (m_nFlag & CUSTOM_LENGTH) != 0;} bool HasSeparator(){ return (m_nFlag & HAS_SEPARATOR) != 0;} float GetTopBorderWidth(){ return m_BorderStuff.GetSideWidth(LwpBorderStuff::TOP);} @@ -277,12 +274,7 @@ private: }; public: - LwpFootnoteNumberOptions& GetFootnoteNumbering(){ return m_FootnoteNumbering;} - LwpFootnoteNumberOptions& GetEndnoteDivisionNumbering(){ return m_EndnoteDivisionNumbering;} - LwpFootnoteNumberOptions& GetEndnoteDivisionGroupNumbering(){ return m_EndnoteDivisionGroupNumbering;} - LwpFootnoteNumberOptions& GetEndnoteDocNumbering(){ return m_EndnoteDocNumbering;} LwpFootnoteSeparatorOptions& GetFootnoteSeparator(){ return m_FootnoteSeparator;} - LwpFootnoteSeparatorOptions& GetFootnoteContinuedSeparator(){ return m_FootnoteContinuedSeparator;} bool GetContinuedFrom(){ return ((m_nFlag & FO_CONTINUEFROM) != 0);} bool GetContinuedOn(){ return ((m_nFlag & FO_CONTINUEON) != 0);} OUString GetContinuedOnMessage(); diff --git a/lotuswordpro/source/filter/lwpfoundry.hxx b/lotuswordpro/source/filter/lwpfoundry.hxx index 3f137c2aeec1..373643cab27c 100644 --- a/lotuswordpro/source/filter/lwpfoundry.hxx +++ b/lotuswordpro/source/filter/lwpfoundry.hxx @@ -196,7 +196,6 @@ protected: LwpObjectID m_Head; public: void Read(LwpObjectStream *pStrm); - LwpObjectID& GetHeadID() { return m_Head;} LwpOrderedObject* Enumerate(LwpOrderedObject* pLast); protected: LwpListList* GetNextActiveListList(LwpListList* pLast); diff --git a/lotuswordpro/source/filter/lwpframelayout.hxx b/lotuswordpro/source/filter/lwpframelayout.hxx index 8c86cc72e28e..2e409644d004 100644 --- a/lotuswordpro/source/filter/lwpframelayout.hxx +++ b/lotuswordpro/source/filter/lwpframelayout.hxx @@ -215,15 +215,13 @@ public: LwpRubyMarker* GetMarker(); void ConvertContentText(); LwpStory* GetContentStory(); - sal_uInt8 GetPosition(){return m_nPlacement;} - sal_uInt8 GetAlignment(){return m_nAlignment;} void RegisterStyle() SAL_OVERRIDE; enum{ - LEFT = 4, - RIGHT = 5, - CENTER = 2, - TOP = 1, - BOTTOM = 3 + LEFT = 4, + RIGHT = 5, + CENTER = 2, + TOP = 1, + BOTTOM = 3 }; protected: void Read() SAL_OVERRIDE; diff --git a/lotuswordpro/source/filter/lwpfrib.hxx b/lotuswordpro/source/filter/lwpfrib.hxx index 8392d83b7a60..72075851a887 100644 --- a/lotuswordpro/source/filter/lwpfrib.hxx +++ b/lotuswordpro/source/filter/lwpfrib.hxx @@ -111,8 +111,6 @@ protected: public: bool m_ModFlag; OUString GetStyleName(){return m_StyleName;}//add by 1-10 -// void SetStyle(LwpFoundry* pFoundry); - bool IsModified(){return m_ModFlag;} void SetModifiers(ModifierInfo* pModifiers); ModifierInfo* GetModifiers(){return m_pModifiers;} virtual void RegisterStyle(LwpFoundry* pFoundry); @@ -127,7 +125,6 @@ public: REV_INSERT =0, REV_DELETE = 1, }; - LwpPara* GetMyPara(){return m_pPara;} private: static void ReadModifiers(LwpObjectStream* pObjStrm,ModifierInfo* pModInfo); protected: diff --git a/lotuswordpro/source/filter/lwpfribptr.hxx b/lotuswordpro/source/filter/lwpfribptr.hxx index ada571f09595..28f4c4b84f45 100644 --- a/lotuswordpro/source/filter/lwpfribptr.hxx +++ b/lotuswordpro/source/filter/lwpfribptr.hxx @@ -78,18 +78,15 @@ public: ~LwpFribPtr(); void ReadPara(LwpObjectStream* pObjStrm); private: -// void ReadModifiers(LwpObjectStream* pObjStrm,ModifierInfo* pModInfo); LwpFrib* m_pFribs; XFParagraph* m_pXFPara;//for parse ,add by 1-17 //Current XFPara used for frib parsing LwpPara* m_pPara;//for get foundry, add by 1-17 static void ProcessDropcap(LwpStory* pStory,LwpFrib* pFrib,sal_uInt32 nLen); public: -// String GetText(); void XFConvert(); void SetXFPara(XFParagraph* Para){m_pXFPara = Para;} XFParagraph* GetXFPara(){return m_pXFPara;} void SetPara(LwpPara* para){m_pPara=para;} - LwpPara* GetPara(){return m_pPara;} void RegisterStyle(); void FindLayouts();// for register pagelayout, add by , 02/20/2005 LwpFrib* GetFribs(){return m_pFribs;} diff --git a/lotuswordpro/source/filter/lwpfribsection.hxx b/lotuswordpro/source/filter/lwpfribsection.hxx index 05f0c3d82bbc..c6cb9d0a5479 100644 --- a/lotuswordpro/source/filter/lwpfribsection.hxx +++ b/lotuswordpro/source/filter/lwpfribsection.hxx @@ -83,8 +83,6 @@ public: void ParseSection(LwpFrib* pFrib); XFSection* CreateXFSection(); - bool IsNewSection(){return m_bNewSection;} - OUString GetSectionStyleName(){return m_SectionStyleName;} OUString GetStyleName(){ return m_StyleName;} OUString GetFillerPageStyleName(){ return m_FillerPageStyleName;} bool IsNextPageType(); @@ -93,7 +91,7 @@ private: bool IsNeedSection(); private: - bool m_bNewSection; + bool m_bNewSection; OUString m_FillerPageStyleName; OUString m_SectionStyleName; OUString m_StyleName; //master page style name diff --git a/lotuswordpro/source/filter/lwpfribtext.hxx b/lotuswordpro/source/filter/lwpfribtext.hxx index 0c48b9ce8d4b..ad41dbc40dda 100644 --- a/lotuswordpro/source/filter/lwpfribtext.hxx +++ b/lotuswordpro/source/filter/lwpfribtext.hxx @@ -105,8 +105,6 @@ public: inline sal_uInt16 GetNumberChar() const; - inline sal_uInt16 GetLevel() const; - inline sal_uInt16 GetStart() const; private: @@ -123,10 +121,6 @@ inline sal_uInt16 LwpFribParaNumber::GetNumberChar() const { return m_nNumberChar; } -inline sal_uInt16 LwpFribParaNumber::GetLevel() const -{ - return m_nLevel; -} inline sal_uInt16 LwpFribParaNumber::GetStart() const { return m_nStart; diff --git a/lotuswordpro/source/filter/lwpgrfobj.hxx b/lotuswordpro/source/filter/lwpgrfobj.hxx index 481b437fb817..ae5b9cf58fcd 100644 --- a/lotuswordpro/source/filter/lwpgrfobj.hxx +++ b/lotuswordpro/source/filter/lwpgrfobj.hxx @@ -107,7 +107,6 @@ private: void XFConvertEquation(XFContentContainer* pCont); - void ParseChart(IXFStream* pOutputStream); bool IsGrafFormatValid(); // add by , 03/25/2005 std::vector< rtl::Reference > m_vXFDrawObjects; @@ -131,7 +130,6 @@ public: void GetGrafOrgSize(double& rWidth, double& rHeight) SAL_OVERRIDE; // end add - OUString GetWatermarkName(){ return m_WatermarkName;} sal_Int16 IsLinked(){ return m_bIsLinked;} OUString GetLinkedFilePath(){ return m_LinkedFilePath;} }; diff --git a/lotuswordpro/source/filter/lwpholder.hxx b/lotuswordpro/source/filter/lwpholder.hxx index b1f061187d76..7e62191b38c4 100644 --- a/lotuswordpro/source/filter/lwpholder.hxx +++ b/lotuswordpro/source/filter/lwpholder.hxx @@ -124,7 +124,6 @@ public: LwpListList(LwpObjectHeader& objHdr, LwpSvStream* pStrm); void Read() SAL_OVERRIDE; LwpObjectID& GetHead(){ return m_HeadTail.GetHead();} - LwpObjectID& GetTail(){ return m_HeadTail.GetTail();} protected: LwpDLVListHeadTail m_HeadTail; private: diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx index b213bfc53b09..7b9f9bc98128 100644 --- a/lotuswordpro/source/filter/lwplayout.hxx +++ b/lotuswordpro/source/filter/lwplayout.hxx @@ -226,10 +226,8 @@ class LwpAssociatedLayouts { public: LwpAssociatedLayouts(){} -public: void Read(LwpObjectStream* pStrm); LwpObjectID& GetOnlyLayout() { return m_OnlyLayout;} - LwpDLVListHeadTail& GetLayouts() { return m_Layouts;} LwpVirtualLayout* GetLayout(LwpVirtualLayout* pStartLayout); protected: LwpObjectID m_OnlyLayout; //LwpVirtualLayout diff --git a/lotuswordpro/source/filter/lwplaypiece.hxx b/lotuswordpro/source/filter/lwplaypiece.hxx index 306101aa153c..7afbc1f95f18 100644 --- a/lotuswordpro/source/filter/lwplaypiece.hxx +++ b/lotuswordpro/source/filter/lwplaypiece.hxx @@ -112,15 +112,9 @@ public: virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE; sal_uInt16 GetScaleMode(){return m_nScaleMode;} sal_uInt32 GetScalePercentage(){return m_nScalePercentage;} - void SetScalePercentage(sal_uInt32 nVal){m_nScalePercentage = nVal;} sal_Int32 GetScaleWidth(){return m_nScaleWidth;} - void SetScaleWidth(sal_Int32 nVal){m_nScaleWidth = nVal;} sal_Int32 GetScaleHeight(){return m_nScaleHeight;} - void SetScaleHeight(sal_Int32 nVal){m_nScaleHeight = nVal;} - sal_uInt16 GetContentRotation(){return m_nContentRotation;} - void SetContentRotation(sal_uInt16 nVal){m_nContentRotation = nVal;} sal_uInt16 GetPlacement(){return m_nPlacement;} - void SetPlacement(sal_uInt16 nVal){m_nPlacement = nVal;} inline LwpPoint& GetOffset() {return m_Offset;} protected: virtual void Read() SAL_OVERRIDE; @@ -218,9 +212,7 @@ public: ~LwpColumnInfo(); void Read(LwpObjectStream *pStrm); inline double GetWidth(){return LwpTools::ConvertFromUnitsToMetric(m_nWidth);} - inline void SetWidth(sal_Int32 w){m_nWidth = w;} inline double GetGap(){return LwpTools::ConvertFromUnitsToMetric(m_nGap);} - inline void SetGap(sal_Int32 g){m_nGap = g;} private: sal_Int32 m_nWidth; sal_Int32 m_nGap; @@ -338,11 +330,6 @@ public: LwpLayoutRelativityGuts(); void Read(LwpObjectStream *pStrm); sal_uInt8 GetRelativeType(){ return m_nRelType;} - sal_uInt8 GetRelativeFromWhere(){ return m_nRelFromWhere;} - LwpPoint GetRelativeDistance(){ return m_RelDistance;} - sal_uInt8 GetTetherType(){ return m_nTether;} - sal_uInt8 GetTetherWhere(){ return m_nTetherWhere;} -public: enum RelativeType { LAY_PARENT_RELATIVE = 1, diff --git a/lotuswordpro/source/filter/lwpnumberingoverride.hxx b/lotuswordpro/source/filter/lwpnumberingoverride.hxx index aa38574c530b..bd62de570311 100644 --- a/lotuswordpro/source/filter/lwpnumberingoverride.hxx +++ b/lotuswordpro/source/filter/lwpnumberingoverride.hxx @@ -83,29 +83,16 @@ public: inline sal_uInt16 GetLevel() const; inline sal_uInt16 GetPosition() const; - - inline bool IsLevelOverridden(); - inline bool IsPositionOverridden(); - inline bool IsHeadingOverridden(); - inline bool IsSmartLevelOverridden(); inline bool IsHeading(); - inline bool IsSmartLevel(); void OverrideLevel(sal_uInt16 nNewLv); - inline void RevertLevel(); - inline void RevertPosition(); - inline void RevertHeading(); - inline void RevertSmartLevel(); - //end add - protected: LwpNumberingOverride(LwpNumberingOverride const& rOther); private: LwpNumberingOverride& operator=(LwpNumberingOverride const& rOther) SAL_DELETED_FUNCTION; -private: sal_uInt16 m_nLevel; sal_uInt16 m_nPosition; }; @@ -120,47 +107,10 @@ inline sal_uInt16 LwpNumberingOverride::GetPosition() const return m_nPosition; } -inline bool LwpNumberingOverride::IsLevelOverridden() -{ - return ((m_nOverride & NO_LEVEL) != 0); -} -inline bool LwpNumberingOverride::IsPositionOverridden() -{ - return ((m_nOverride & NO_POSITION) != 0); -} -inline bool LwpNumberingOverride::IsHeadingOverridden() -{ - return ((m_nOverride & HEADING) != 0); -} -inline bool LwpNumberingOverride::IsSmartLevelOverridden() -{ - return ((m_nOverride & SMARTLEVEL) != 0); -} inline bool LwpNumberingOverride::IsHeading() { return (m_nValues & HEADING) != 0; } -inline bool LwpNumberingOverride::IsSmartLevel() -{ - return (m_nValues & SMARTLEVEL) != 0; -} - -inline void LwpNumberingOverride::RevertLevel() -{ - LwpOverride::Override(NO_LEVEL, STATE_STYLE); -} -inline void LwpNumberingOverride::RevertPosition() -{ - LwpOverride::Override(NO_POSITION, STATE_STYLE); -} -inline void LwpNumberingOverride::RevertHeading() -{ - LwpOverride::Override(HEADING, STATE_STYLE); -} -inline void LwpNumberingOverride::RevertSmartLevel() -{ - LwpOverride::Override(SMARTLEVEL, STATE_STYLE); -} //end add diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx b/lotuswordpro/source/filter/lwpnumericfmt.hxx index b4501032e583..917f9bfc8166 100644 --- a/lotuswordpro/source/filter/lwpnumericfmt.hxx +++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx @@ -78,7 +78,6 @@ public: void QuickRead(LwpObjectStream* pStrm); OUString GetPrefix(){ return cPrefix.str();} OUString GetSuffix(){ return cSuffix.str();} - bool IsBlack(){ return (cColor.GetBlue()==0 && cColor.GetGreen()==0 && cColor.GetRed()==0);} bool IsDefaultPrefix(){ return !(cSubFlags&SF_OVER_PREFIX); } bool IsDefaultSuffix(){ return !(cSubFlags&SF_OVER_SUFFIX); } LwpColor GetColor(); @@ -255,7 +254,6 @@ public: sal_uInt16 GetDecimalPlaces(); bool IsDecimalPlacesOverridden(); bool IsNegativeOverridden(); - bool IsZeroOverridden(); XFStyle* Convert(); private: @@ -297,12 +295,6 @@ LwpNumericFormat::IsNegativeOverridden() return (cFlags & NF_OVER_NEGATIVE) != 0; } -inline bool -LwpNumericFormat::IsZeroOverridden() -{ - return (cFlags & NF_OVER_ZERO) != 0; -} - #include "lwppiece.hxx" class LwpLayoutNumerics : public LwpVirtualPiece { diff --git a/lotuswordpro/source/filter/lwpobj.hxx b/lotuswordpro/source/filter/lwpobj.hxx index 942e04415dc8..6d89c7e8814e 100644 --- a/lotuswordpro/source/filter/lwpobj.hxx +++ b/lotuswordpro/source/filter/lwpobj.hxx @@ -104,7 +104,6 @@ public: void SetFoundry(LwpFoundry* pFoundry){m_pFoundry = pFoundry;} LwpObjectID& GetObjectID(){ return m_ObjHdr.GetID();} sal_uInt32 GetTag() { return m_ObjHdr.GetTag();} - LwpSvStream* GetStream() { return m_pStrm; } }; #endif diff --git a/lotuswordpro/source/filter/lwpobjid.hxx b/lotuswordpro/source/filter/lwpobjid.hxx index 05e1fb769f56..6cc11e7d245d 100644 --- a/lotuswordpro/source/filter/lwpobjid.hxx +++ b/lotuswordpro/source/filter/lwpobjid.hxx @@ -100,12 +100,9 @@ public: static sal_uInt32 DiskSize() { return sizeof(sal_uInt32) + sizeof(sal_uInt16); } // sizeof(m_nLow) + sizeof(m_nHigh) sal_uInt32 DiskSizeIndexed() const; bool IsNull() const; - bool IsCompressed(); sal_uInt32 GetLow() const ; sal_uInt16 GetHigh() const ; - void SetLow(sal_uInt32 nl); - void SetHigh(sal_uInt16 nh); bool operator == (const LwpObjectID &Other) const; bool operator != (const LwpObjectID &Other) const; @@ -128,26 +125,16 @@ inline bool LwpObjectID::operator != (const LwpObjectID &Other) const return (m_nHigh != Other.m_nHigh) || (m_nLow != Other.m_nLow); } -inline bool LwpObjectID::IsCompressed() -{ - return m_bIsCompressed; -} inline sal_uInt32 LwpObjectID::GetLow() const { return m_nLow; } + inline sal_uInt16 LwpObjectID::GetHigh() const { return m_nHigh; } -inline void LwpObjectID::SetLow(sal_uInt32 nl) -{ - m_nLow=nl; -} -inline void LwpObjectID::SetHigh(sal_uInt16 nh) -{ - m_nHigh = nh; -} + inline size_t LwpObjectID::HashCode() const { return static_cast( diff --git a/lotuswordpro/source/filter/lwpobjstrm.hxx b/lotuswordpro/source/filter/lwpobjstrm.hxx index 3138a496a1ed..1cda4d252166 100644 --- a/lotuswordpro/source/filter/lwpobjstrm.hxx +++ b/lotuswordpro/source/filter/lwpobjstrm.hxx @@ -105,9 +105,7 @@ public: double QuickReadDouble(bool *pFailure=NULL); OUString QuickReadStringPtr(); - void QuickReadStringWithMax(unsigned char * pString, sal_uInt16 MaxLen); -public: void ReadComplete(); LwpSvStream *GetStream(); private: diff --git a/lotuswordpro/source/filter/lwppagehint.hxx b/lotuswordpro/source/filter/lwppagehint.hxx index e37153c9f835..2750f1730b85 100644 --- a/lotuswordpro/source/filter/lwppagehint.hxx +++ b/lotuswordpro/source/filter/lwppagehint.hxx @@ -103,8 +103,6 @@ public: void Read() SAL_OVERRIDE; void Parse(IXFStream* pOutputStream) SAL_OVERRIDE; sal_uInt16 GetPageNumber(){return m_nPageNumber;} - LwpObjectID& GetCurrentSectionID(){return m_CurrentSection;} - sal_uInt16 GetCurrentSectionPage(){return m_nCurrentSectionPage;} LwpObjectID& GetPageLayoutID(){ return m_PageLayout;} sal_uInt16 GetLayoutPageNumber(){ return m_nLayoutPageNumber;} private: diff --git a/lotuswordpro/source/filter/lwppara.hxx b/lotuswordpro/source/filter/lwppara.hxx index d3d7bf637ccc..5907b3c7c9d3 100644 --- a/lotuswordpro/source/filter/lwppara.hxx +++ b/lotuswordpro/source/filter/lwppara.hxx @@ -157,7 +157,6 @@ public: LwpPara* GetParent(); LwpObjectID& GetStoryID(); LwpStory* GetStory(); - LwpBreaksOverride* GetBreaks(); LwpParaStyle* GetParaStyle(); XFParaStyle* GetXFParaStyle(); @@ -166,7 +165,6 @@ public: LwpNumberingOverride* GetParaNumbering(); inline LwpSilverBullet* GetSilverBullet(); - inline LwpObjectID GetSilverBulletID(); OUString GetBulletChar() const; sal_uInt32 GetBulletFontID() const; sal_uInt16 GetLevel() const; @@ -179,7 +177,6 @@ public: void GatherDropcapInfo(); OUString GetBulletStyleName() const; void SetBelowSpacing(double value); - void SetBulletStyleName(const OUString& rNewName); void SetBulletFlag(bool bFlag); void SetIndent(LwpIndentOverride* pIndentOverride); void SetFirstFrib(const OUString& Content,sal_uInt32 FontID); @@ -189,7 +186,6 @@ public: void SetDropcapLines(sal_uInt16 number); void SetDropcapChars(sal_uInt32 chars); void SetDropcapLayout(LwpDropcapLayout* pLayout); - bool IsHasDropcap(); XFContentContainer* GetXFContainer(); void AddXFContent(XFContent* pCont); @@ -205,7 +201,6 @@ public: bool IsInCell(); void SetAllText(const OUString& sText); - OUString GetStyleName(){return m_StyleName;} protected: sal_uInt32 m_nOrdinal; // Ordinal number of this paragraph @@ -299,10 +294,6 @@ inline LwpSilverBullet* LwpPara::GetSilverBullet() { return m_pSilverBullet; } -inline LwpObjectID LwpPara::GetSilverBulletID() -{ - return m_aSilverBulletID; -} inline OUString LwpPara::GetBulletChar() const { return m_Content; @@ -315,10 +306,6 @@ inline sal_uInt16 LwpPara::GetLevel() const { return m_nLevel; } -inline void LwpPara::SetBulletStyleName(const OUString& rNewName) -{ - m_aBulletStyleName = rNewName; -} inline void LwpPara::SetBulletFlag(bool bFlag) { m_bHasBullet = bFlag; @@ -331,10 +318,6 @@ inline LwpFribPtr& LwpPara::GetFribs() { return m_Fribs; } -inline LwpBreaksOverride* LwpPara::GetBreaks() -{ - return m_pBreaks; -} inline XFContentContainer* LwpPara::GetXFContainer() { return m_pXFContainer; @@ -371,11 +354,6 @@ inline LwpStory* LwpPara::GetStory() return dynamic_cast(m_Story.obj().get()); return NULL; } - -inline bool LwpPara::IsHasDropcap() -{ - return m_bHasDropcap; -} inline void LwpPara::SetParaDropcap(bool bFlag) { m_bHasDropcap = bFlag; diff --git a/lotuswordpro/source/filter/lwpparaproperty.hxx b/lotuswordpro/source/filter/lwpparaproperty.hxx index 0a9eb2c6a914..9f5b6aa229fb 100644 --- a/lotuswordpro/source/filter/lwpparaproperty.hxx +++ b/lotuswordpro/source/filter/lwpparaproperty.hxx @@ -93,7 +93,6 @@ public: virtual ~LwpParaProperty(){} virtual sal_uInt32 GetType() = 0; inline LwpParaProperty* GetNext(); - inline LwpParaProperty* GetPrevious(); static LwpParaProperty* ReadPropertyList(LwpObjectStream* pFile,rtl::Reference const & Whole); @@ -104,11 +103,6 @@ inline LwpParaProperty* LwpParaProperty::GetNext() return static_cast(LwpDLList::GetNext()); } -inline LwpParaProperty* LwpParaProperty::GetPrevious() -{ - return static_cast(LwpDLList::GetPrevious()); -} - //align/indent/spacing //TO DO:border/background etc diff --git a/lotuswordpro/source/filter/lwpsection.hxx b/lotuswordpro/source/filter/lwpsection.hxx index f65052ea1c12..b46df3eb892f 100644 --- a/lotuswordpro/source/filter/lwpsection.hxx +++ b/lotuswordpro/source/filter/lwpsection.hxx @@ -95,10 +95,7 @@ class LwpSection : public LwpOrderedObject public: LwpSection(LwpObjectHeader &objHdr, LwpSvStream* pStrm); virtual ~LwpSection(); - inline sal_uInt16 GetFlags(); inline LwpPageLayout* GetPageLayout(); - inline LwpColor& GetColor(); - inline LwpAtomHolder& GetAtomHolder(); void Parse(IXFStream* pOutputStream) SAL_OVERRIDE; OUString GetSectionName(){return m_AtomHolder.str();} @@ -112,15 +109,6 @@ private: }; -/** - * @descr Get flags value - * - */ -inline sal_uInt16 LwpSection::GetFlags() -{ - return m_Flags; -} - /** * @descr Get page layout pointer * @@ -130,24 +118,6 @@ inline LwpPageLayout* LwpSection::GetPageLayout() return dynamic_cast(m_PageLayout.obj().get()); } -/** - * @descr get section tab color - * - */ -inline LwpColor& LwpSection::GetColor() -{ - return m_Color; -} - -/** - * @descr get section atom holder pointer - * - */ -inline LwpAtomHolder& LwpSection::GetAtomHolder() -{ - return m_AtomHolder; -} - class LwpIndexSection : public LwpSection { public: diff --git a/lotuswordpro/source/filter/lwpsilverbullet.hxx b/lotuswordpro/source/filter/lwpsilverbullet.hxx index 41b2a38f7218..dfa11584e670 100644 --- a/lotuswordpro/source/filter/lwpsilverbullet.hxx +++ b/lotuswordpro/source/filter/lwpsilverbullet.hxx @@ -113,17 +113,17 @@ public: static OUString GetSuffix() { return OUString(); } - inline OUString GetNumberingName(); + ; - inline LwpPara* GetNumberingPara(); + ; bool HasName(); static OUString GetNumCharByStyleID(LwpFribParaNumber* pParaNumber); - static inline bool IsPosCumulative(sal_uInt16 nHideLevels); + ; inline bool IsLesserLevel(sal_uInt16 nPos); - inline bool IsNewSection(sal_uInt16 nPos); + ; LwpPara* GetBulletPara(); @@ -160,28 +160,10 @@ inline OUString LwpSilverBullet::GetBulletStyleName() const { return m_strStyleName; } - -inline OUString LwpSilverBullet::GetNumberingName() -{ - return GetName().str(); -} -inline LwpPara* LwpSilverBullet::GetNumberingPara() -{ - return m_pBulletPara; -} -inline bool LwpSilverBullet::IsPosCumulative(sal_uInt16 nHideLevels) -{ - sal_uInt16 AttrMask = ~nHideLevels; - return ((AttrMask & (AttrMask - 1)) != 0); -} inline bool LwpSilverBullet::IsLesserLevel(sal_uInt16 nPos) { return ((m_pResetPositionFlags[nPos] & LESSERLEVEL) != 0); } -inline bool LwpSilverBullet::IsNewSection(sal_uInt16 nPos) -{ - return ((m_pResetPositionFlags[nPos] & NEWSECTION) != 0); -} #endif diff --git a/lotuswordpro/source/filter/lwpslvlist.hxx b/lotuswordpro/source/filter/lwpslvlist.hxx index c4037e6992e3..82c009b5f40f 100644 --- a/lotuswordpro/source/filter/lwpslvlist.hxx +++ b/lotuswordpro/source/filter/lwpslvlist.hxx @@ -69,15 +69,12 @@ class LwpSLVList public: LwpSLVList(){} explicit LwpSLVList(LwpObjectStream* pStrm){Read(pStrm);} -public: void Read(LwpObjectStream* pStrm) { m_NextID.ReadIndexed(pStrm); if( LwpFileHeader::m_nFileRevision < 0x0006 ) pStrm->SkipExtra(); } - LwpObjectID& GetNext(){return m_NextID;} -public: private: LwpObjectID m_NextID; }; diff --git a/lotuswordpro/source/filter/lwpstory.hxx b/lotuswordpro/source/filter/lwpstory.hxx index a546b9d88ca8..79b03c1ba919 100644 --- a/lotuswordpro/source/filter/lwpstory.hxx +++ b/lotuswordpro/source/filter/lwpstory.hxx @@ -106,7 +106,6 @@ public: void Parse(IXFStream* pOutputStream) SAL_OVERRIDE; virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE; void XFConvertFrameInPage(XFContentContainer* pCont); - inline LwpDLVListHeadTail& GetParaList(); inline LwpObjectID& GetFirstPara(); inline LwpObjectID& GetLastPara(); XFContentContainer* GetXFContent(); @@ -139,10 +138,6 @@ public: OUString RegisterFirstFribStyle(); }; -LwpDLVListHeadTail& LwpStory::GetParaList() -{ - return m_ParaList; -} LwpObjectID& LwpStory::GetFirstPara() { return m_ParaList.GetHead(); diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx index 4580a6a59203..816768998a54 100644 --- a/lotuswordpro/source/filter/lwptablelayout.cxx +++ b/lotuswordpro/source/filter/lwptablelayout.cxx @@ -1472,21 +1472,6 @@ void LwpTableHeadingLayout::GetStartEndRow(sal_uInt16& nStartRow, sal_uInt16& nE nStartRow = cStartRow; nEndRow = cEndRow; } -/** - * @short get first row heading layout of table heading - * @param - * @return LwpRowHeadingLayout * - pointer to first row heading layout of table heading - */ -LwpRowHeadingLayout * LwpTableHeadingLayout::GetFirstRowHeadingLayout() -{ - LwpObjectID& rID = GetChildHead(); - if(!rID.IsNull()) - { - LwpRowHeadingLayout * pHeadingRow = dynamic_cast(rID.obj().get()); - return pHeadingRow; - } - return NULL; -} LwpSuperParallelColumnLayout::LwpSuperParallelColumnLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpSuperTableLayout(objHdr, pStrm) { diff --git a/lotuswordpro/source/filter/lwptablelayout.hxx b/lotuswordpro/source/filter/lwptablelayout.hxx index 54c43465cab3..009afed5c47c 100644 --- a/lotuswordpro/source/filter/lwptablelayout.hxx +++ b/lotuswordpro/source/filter/lwptablelayout.hxx @@ -221,7 +221,6 @@ public: virtual ~LwpTableHeadingLayout(); virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_TABLE_HEADING_LAYOUT;} void GetStartEndRow(sal_uInt16& nStartRow, sal_uInt16& nEndRow); - LwpRowHeadingLayout * GetFirstRowHeadingLayout(); protected: void Read() SAL_OVERRIDE; sal_uInt16 cStartRow; diff --git a/lotuswordpro/source/filter/lwptabrack.hxx b/lotuswordpro/source/filter/lwptabrack.hxx index d8c6e617fee7..c4e6244df7ce 100644 --- a/lotuswordpro/source/filter/lwptabrack.hxx +++ b/lotuswordpro/source/filter/lwptabrack.hxx @@ -98,7 +98,6 @@ public: inline sal_uInt32 GetPosition(); inline TabType GetTabType(); inline LeaderType GetLeaderType(); - inline RelativeType GetRelativeType(); inline sal_uInt16 GetAlignChar(); protected: @@ -123,10 +122,6 @@ inline LwpTab::LeaderType LwpTab::GetLeaderType() { return (LwpTab::LeaderType)m_nLeader; } -inline LwpTab::RelativeType LwpTab::GetRelativeType() -{ - return (LwpTab::RelativeType)m_nRelativeType; -} inline sal_uInt16 LwpTab::GetAlignChar() { diff --git a/lotuswordpro/source/filter/lwptblcell.hxx b/lotuswordpro/source/filter/lwptblcell.hxx index 2a2273cb153d..d4ebafc5c0b4 100644 --- a/lotuswordpro/source/filter/lwptblcell.hxx +++ b/lotuswordpro/source/filter/lwptblcell.hxx @@ -87,7 +87,6 @@ public: virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE; LwpObjectID GetNextID(){return GetNext();} sal_uInt8 GetColumnID(){return cColumn;} - virtual bool IsFormula(){return false;} LwpObjectID GetValueID(){return cValue;} virtual void Convert(XFCell * pCell, LwpTableLayout* pCellsMap=NULL); @@ -317,22 +316,8 @@ public: ~LwpRowSpecifier(){} void QuickRead(LwpObjectStream *pStrm); - OUString ToString(sal_uInt16 nFormulaRow); sal_uInt16 RowID(sal_uInt16 FormulaRow); - sal_uInt16 &Row(); - - void SetAbsolute(); - void ClearAbsolute(); - bool IsAbsolute(); - - void SetAfter(); - void ClearAfter(); - bool IsAfter(); - - void SetBad(bool Bad); - bool IsBad(); - void SetRowDelta(sal_uInt16 ReferenceRowID, sal_uInt16 FormulaRowID); private: sal_uInt16 cRow; @@ -354,59 +339,6 @@ LwpRowSpecifier::RowID(sal_uInt16 FormulaRow) return FormulaRow - cRow; } -inline sal_uInt16 & -LwpRowSpecifier::Row() -{ - return cRow; -} - -inline void -LwpRowSpecifier::SetAbsolute() -{ - cQualifier.SetAbsolute(); -} - -inline void -LwpRowSpecifier::ClearAbsolute() -{ - cQualifier.ClearAbsolute(); -} - -inline bool -LwpRowSpecifier::IsAbsolute() -{ - return cQualifier.IsAbsolute(); -} - -inline void -LwpRowSpecifier::SetAfter() -{ - cQualifier.SetAfter(); -} - -inline void -LwpRowSpecifier::ClearAfter() -{ - cQualifier.ClearAfter(); -} - -inline bool -LwpRowSpecifier::IsAfter() -{ - return cQualifier.IsAfter(); -} - -inline void -LwpRowSpecifier::SetBad(bool Bad) -{ - cQualifier.SetBad(Bad); -} - -inline bool -LwpRowSpecifier::IsBad() -{ - return cQualifier.IsBad(); -} /** * @brief * column id @@ -421,19 +353,8 @@ public: {} void QuickRead(LwpObjectStream *pStrm); - sal_uInt8 Column(){return cColumn;} - OUString ToString(sal_uInt8 nFormulaCol); sal_uInt8 ColumnID(sal_uInt8 FormulaColumn); - void SetAbsolute(); - void ClearAbsolute(); - bool IsAbsolute(); - void SetAfter(); - void ClearAfter(); - bool IsAfter(); - void SetBad(bool Bad); - bool IsBad(); - void SetColumnDelta(sal_uInt8 ReferenceColumnID, sal_uInt8 FormulaColumnID); private: sal_uInt8 cColumn; @@ -454,53 +375,6 @@ LwpColumnSpecifier::ColumnID(sal_uInt8 FormulaColumn) return FormulaColumn - cColumn; } -inline void -LwpColumnSpecifier::SetAbsolute() -{ - cQualifier.SetAbsolute(); -} - -inline void -LwpColumnSpecifier::ClearAbsolute() -{ - cQualifier.ClearAbsolute(); -} - -inline bool -LwpColumnSpecifier::IsAbsolute() -{ - return cQualifier.IsAbsolute(); -} - -inline void -LwpColumnSpecifier::SetAfter() -{ - cQualifier.SetAfter(); -} - -inline void -LwpColumnSpecifier::ClearAfter() -{ - cQualifier.ClearAfter(); -} - -inline bool -LwpColumnSpecifier::IsAfter() -{ - return cQualifier.IsAfter(); -} - -inline void -LwpColumnSpecifier::SetBad(bool Bad) -{ - cQualifier.SetBad(Bad); -} - -inline bool -LwpColumnSpecifier::IsBad() -{ - return cQualifier.IsBad(); -} #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwptblformula.hxx b/lotuswordpro/source/filter/lwptblformula.hxx index e405958e149b..488284e68fb0 100644 --- a/lotuswordpro/source/filter/lwptblformula.hxx +++ b/lotuswordpro/source/filter/lwptblformula.hxx @@ -198,8 +198,6 @@ class LwpFormulaInfo : public LwpCellList { public: LwpFormulaInfo(LwpObjectHeader &objHdr, LwpSvStream* pStrm); - bool IsFormula() SAL_OVERRIDE {return true;} - void SetRow(sal_uInt16 nRow){ m_nFormulaRow = nRow;} OUString Convert(LwpTableLayout* pCellsMap); void Convert(XFCell * pCell, LwpTableLayout* pCellsMap) SAL_OVERRIDE; protected: diff --git a/lotuswordpro/source/filter/lwptools.hxx b/lotuswordpro/source/filter/lwptools.hxx index 42d9a55dc7fb..97b124b63de6 100644 --- a/lotuswordpro/source/filter/lwptools.hxx +++ b/lotuswordpro/source/filter/lwptools.hxx @@ -96,11 +96,8 @@ public: inline static double ConvertFromUnits(const sal_Int32& nUnits); inline static double ConvertToMetric(const double& fInch); - inline static double ConvertFromMetric(const double& fCM); inline static double ConvertFromUnitsToMetric(const sal_Int32& nUnits); - inline static sal_Int32 ConvertToUnits(const double& fInch); - inline static bool IsOddNumber(sal_uInt16& nNumber); inline static bool IsEvenNumber(sal_uInt16& nNumber); @@ -120,19 +117,11 @@ inline double LwpTools::ConvertToMetric(const double& fInch) { return fInch*CM_PER_INCH; } -inline double LwpTools::ConvertFromMetric(const double& fCM) -{ - return fCM/CM_PER_INCH; -} inline double LwpTools::ConvertFromUnitsToMetric(const sal_Int32& nUnits) { double fInch = ConvertFromUnits(nUnits); return ConvertToMetric(fInch); } -inline sal_Int32 LwpTools::ConvertToUnits(const double& fInch) -{ - return (sal_Int32)fInch*UNITS_PER_INCH; -} inline bool LwpTools::IsOddNumber(sal_uInt16& nNumber) { return (nNumber%2) != 0; diff --git a/lotuswordpro/source/filter/utlist.hxx b/lotuswordpro/source/filter/utlist.hxx index 08774a90695e..40409c9b5c88 100644 --- a/lotuswordpro/source/filter/utlist.hxx +++ b/lotuswordpro/source/filter/utlist.hxx @@ -75,12 +75,6 @@ public: // Methods explicit CUtListElmt(pCUtListElmt pPrev) { InsertAfter(pPrev); } explicit CUtListElmt(pCUtList pList); virtual ~CUtListElmt(); - void Remove() - { - cpPrev->cpNext = cpNext; - cpNext->cpPrev = cpPrev; - cpNext = NULL; - } bool OnList() { return cpNext != NULL; } void MakeNotOnList() { cpNext = NULL; } // Same as Remove but doesn't // patch up list @@ -122,8 +116,6 @@ public: // Methods pCUtListElmt GetLast() { return cDummyElmt.GetPrev(); } CUtListElmt& GetTerminating() { return cDummyElmt; } pCUtListElmt GetNextOrNULL(pCUtListElmt pCurr); - bool IsEmpty() { return GetFirst() == &GetTerminating(); }; - bool ContainsAtLeastTwoItems() { return GetFirst() != GetLast(); }; void Destroy(); diff --git a/lotuswordpro/source/filter/xfilter/ixfstyle.hxx b/lotuswordpro/source/filter/xfilter/ixfstyle.hxx index 39a4d9cbeb23..ceae4774c6b2 100644 --- a/lotuswordpro/source/filter/xfilter/ixfstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/ixfstyle.hxx @@ -92,11 +92,6 @@ public: */ virtual enumXFStyle GetStyleFamily() = 0; - /** - * @descr: Set the style family,not quite useful. - */ - virtual void SetStyleFamily(enumXFStyle family) = 0; - /** * @descr: Compare wheather two style object are the same.Used only by XFStyleManager. * @param: pStyle the style to be compared. diff --git a/lotuswordpro/source/filter/xfilter/xfcell.hxx b/lotuswordpro/source/filter/xfilter/xfcell.hxx index 9ae0010f4e62..a532d0b20e7c 100644 --- a/lotuswordpro/source/filter/xfilter/xfcell.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcell.hxx @@ -131,21 +131,6 @@ public: */ OUString GetCellName(); - /** - * @descr Return cell column id. - */ - sal_Int32 GetCol(); - - /** - * @descr return cell'owner row. - */ - XFRow* GetOwnerRow(); - - /** - * @descr If cell has a sub-table, return it, else return NULL. - */ - XFTable* GetSubTable(); - /** * @descr return cell column span property. */ @@ -157,15 +142,15 @@ public: virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; private: - XFRow *m_pOwnerRow; - XFTable *m_pSubTable; - sal_Int32 m_nCol; - sal_Int32 m_nColSpaned; - sal_Int32 m_nRepeated; + XFRow *m_pOwnerRow; + XFTable *m_pSubTable; + sal_Int32 m_nCol; + sal_Int32 m_nColSpaned; + sal_Int32 m_nRepeated; enumXFValueType m_eValueType; - OUString m_strValue; - OUString m_strFormula; - bool m_bProtect; + OUString m_strValue; + OUString m_strFormula; + bool m_bProtect; }; inline void XFCell::SetColumnSpaned(sal_Int32 num) @@ -198,21 +183,6 @@ inline void XFCell::SetOwnerRow(XFRow *pRow) m_pOwnerRow = pRow; } -inline sal_Int32 XFCell::GetCol() -{ - return m_nCol; -} - -inline XFRow* XFCell::GetOwnerRow() -{ - return m_pOwnerRow; -} - -inline XFTable* XFCell::GetSubTable() -{ - return m_pSubTable; -} - inline sal_Int32 XFCell::GetColSpaned() { return m_nColSpaned; diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx b/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx index 85a267b73ce0..2f6057859d1f 100644 --- a/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.hxx @@ -124,11 +124,6 @@ public: */ void SetBackImage(XFBGImage *pImage); - /** - * @descr Set cell value to warp if it's content is too long to be placed in an single cell. - */ - void SetWrapText(bool wrap); - virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE; virtual bool Equal(IXFStyle *pStyle) SAL_OVERRIDE; @@ -163,10 +158,6 @@ inline void XFCellStyle::SetDataStyle(const OUString& style) m_strDataStyle = style; } -inline void XFCellStyle::SetWrapText(bool wrap) -{ - m_bWrapText = wrap; -} #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfchange.hxx b/lotuswordpro/source/filter/xfilter/xfchange.hxx index 74599eb39b5e..bcc095153659 100644 --- a/lotuswordpro/source/filter/xfilter/xfchange.hxx +++ b/lotuswordpro/source/filter/xfilter/xfchange.hxx @@ -85,7 +85,6 @@ public: virtual ~XFChangeRegion(){} virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; void SetChangeID(const OUString& sID){m_sID=sID;} - OUString GetChangeID(){return m_sID;} void SetEditor(const OUString& sEditor){m_sEditor=sEditor;} protected: OUString m_sID; @@ -114,8 +113,6 @@ public: XFChange(){} virtual ~XFChange(){} void ToXml(IXFStream *pStrm) SAL_OVERRIDE; - void SetChangeID(const OUString& sID){m_sID=sID;} - OUString GetChangeID(){return m_sID;} private: OUString m_sID; }; @@ -127,7 +124,6 @@ public: virtual ~XFChangeStart(){} void ToXml(IXFStream *pStrm) SAL_OVERRIDE; void SetChangeID(const OUString& sID){m_sID=sID;} - OUString GetChangeID(){return m_sID;} private: OUString m_sID; }; @@ -139,7 +135,6 @@ public: virtual ~XFChangeEnd(){} void ToXml(IXFStream *pStrm) SAL_OVERRIDE; void SetChangeID(const OUString& sID){m_sID=sID;} - OUString GetChangeID(){return m_sID;} private: OUString m_sID; }; diff --git a/lotuswordpro/source/filter/xfilter/xfcolor.hxx b/lotuswordpro/source/filter/xfilter/xfcolor.hxx index 429e79e40eb1..53f4e0a13220 100644 --- a/lotuswordpro/source/filter/xfilter/xfcolor.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcolor.hxx @@ -93,21 +93,6 @@ public: m_bValid = true; } - /** - * @descr return red part of the color. - */ - sal_uInt8 GetRed() const{ return m_nRed; } - - /** - * @descr return green part of the color. - */ - sal_uInt8 GetGreen() const{ return m_nGreen; } - - /** - * @descr return blue part of the color. - */ - sal_uInt8 GetBlue() const{ return m_nBlue; } - /** * @descr helper function to assert whether a color is valid. */ diff --git a/lotuswordpro/source/filter/xfilter/xfdate.hxx b/lotuswordpro/source/filter/xfilter/xfdate.hxx index 46bf82d39989..338731072e98 100644 --- a/lotuswordpro/source/filter/xfilter/xfdate.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdate.hxx @@ -73,15 +73,6 @@ public: virtual ~XFDate(); -public: - void SetDate(XFDateTime& dt); - - void SetDate(const OUString& date); - - void SetText(OUString& text); - - void SetFixed(bool fixed = true); - virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; private: @@ -92,29 +83,6 @@ private: bool m_bValued; }; -inline void XFDate::SetDate(XFDateTime& dt) -{ - m_aDateTime = dt; - m_strDate = DateTimeToOUString(m_aDateTime); - m_bValued = true; -} - -inline void XFDate::SetDate(const OUString& date) -{ - m_strDate = date; - m_bValued = true; -} - -inline void XFDate::SetText(OUString& text) -{ - m_strText = text; -} - -inline void XFDate::SetFixed(bool fixed) -{ - m_bFixed = fixed; -} - class XFDateStart : public XFDate { public: diff --git a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx b/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx index 141a9927ae6e..a334b749cfdb 100644 --- a/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdatestyle.hxx @@ -87,15 +87,6 @@ public: virtual ~XFDateStyle(); public: - - void SetFixed(bool fixed); - - void SetLanguage(const OUString& lang); - - void SetCountry(const OUString& country); - - void SetAutoOrder(bool bAutoOrder); - void AddYear( bool bLongFmt = true ); void AddMonth( bool bLongFmt = true, bool bTexture = false ); @@ -104,12 +95,8 @@ public: void AddWeekDay( bool bLongFmt = true ); - void AddYearWeek(); - void AddEra(bool bLongFmt = false); - void AddQuarter(bool bLongFmt = false); - void AddHour( bool bLongFmt = true ); void AddMinute( bool bLongFmt = true ); @@ -137,26 +124,6 @@ inline void XFDatePart::SetTexture(bool bTexture) m_bTexture = bTexture; } -inline void XFDateStyle::SetFixed(bool fixed) -{ - m_bFixed = fixed; -} - -inline void XFDateStyle::SetLanguage(const OUString& lang) -{ - m_strLanguage = lang; -} - -inline void XFDateStyle::SetCountry(const OUString& country) -{ - m_strCountry = country; -} - -inline void XFDateStyle::SetAutoOrder(bool bAutoOrder) -{ - m_bAutoOrder = bAutoOrder; -} - inline void XFDateStyle::AddYear( bool bLongFmt ) { XFDatePart *part = new XFDatePart(); @@ -190,13 +157,6 @@ inline void XFDateStyle::AddWeekDay( bool bLongFmt ) m_aParts.AddStyle(part); } -inline void XFDateStyle::AddYearWeek() -{ - XFDatePart *part = new XFDatePart(); - part->SetPartType(enumXFDateYearWeek); - m_aParts.AddStyle(part); -} - inline void XFDateStyle::AddEra(bool bLongFmt) { XFDatePart *part = new XFDatePart(); @@ -205,14 +165,6 @@ inline void XFDateStyle::AddEra(bool bLongFmt) m_aParts.AddStyle(part); } -inline void XFDateStyle::AddQuarter(bool bLongFmt) -{ - XFDatePart *part = new XFDatePart(); - part->SetPartType(enumXFDateQuarter); - part->SetLongFmt(bLongFmt); - m_aParts.AddStyle(part); -} - inline void XFDateStyle::AddText( const OUString& text ) { XFDatePart *part = new XFDatePart(); diff --git a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx index 7dcfa32c0bb8..32e32c6977e2 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx @@ -83,11 +83,6 @@ public: XFDrawObject(); public: - /** - * @descr Set style name for drawing text. - */ - void SetTextStyleName(const OUString& style); - /** * @descr Set drawing object rotate. */ @@ -98,61 +93,21 @@ public: m_aRotatePoint = rRotatePoint; } - /** - * @descr Set drawing object scale. - */ - void SetScale(double cx, double cy); - - /** - * @descr Set drawing object skew. - */ - void SetSkewX(double cx); - - /** - * @descr Set drawing object y skew. - */ - void SetSkewY(double cy); - void ContentToXml(IXFStream *pStrm); virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; protected: XFContentContainer m_aContents; - OUString m_strTextStyle; - double m_fRotate; - XFPoint m_aRotatePoint; - double m_fScaleX; - double m_fScaleY; - double m_fSkewX; - double m_fSkewY; - + OUString m_strTextStyle; + double m_fRotate; + XFPoint m_aRotatePoint; + double m_fScaleX; + double m_fScaleY; + double m_fSkewX; + double m_fSkewY; unsigned int m_nFlag; }; -inline void XFDrawObject::SetTextStyleName(const OUString& style) -{ - m_strTextStyle = style; -} - -inline void XFDrawObject::SetScale(double cx, double cy) -{ - m_nFlag |= XFDRAWOBJECT_FLAG_SCALE; - m_fScaleX = cx; - m_fScaleY = cy; -} - -inline void XFDrawObject::SetSkewX(double cx) -{ - m_nFlag |= XFDRAWOBJECT_FLAG_SKEWX; - m_fSkewX = cx*2*PI/360; -} - -inline void XFDrawObject::SetSkewY(double cy) -{ - m_nFlag |= XFDRAWOBJECT_FLAG_SKEWY; - m_fSkewY = cy*2*PI/360; -} - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpolyline.hxx b/lotuswordpro/source/filter/xfilter/xfdrawpolyline.hxx index 52968d40257c..1632c1994d3e 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawpolyline.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawpolyline.hxx @@ -75,12 +75,6 @@ public: m_aPoints.push_back( XFPoint(x,y) ); } - void AddPoint(const XFPoint& pt) - { - assert(pt.GetX()>=0&&pt.GetY()>=0); - m_aPoints.push_back(pt); - } - XFRect CalcViewBox(); virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; diff --git a/lotuswordpro/source/filter/xfilter/xfdrawrect.hxx b/lotuswordpro/source/filter/xfilter/xfdrawrect.hxx index d67a51c9ea9d..9edc185b2936 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawrect.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawrect.hxx @@ -75,12 +75,6 @@ public: void SetSize(double width, double height); - void SetWidth(double width); - - void SetHeight(double height); - - void SetCornerRadius(double fCornerRadius); - virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; private: @@ -92,21 +86,6 @@ inline void XFDrawRect::SetSize(double width, double height) m_aRect.SetSize(width,height); } -inline void XFDrawRect::SetWidth(double width) -{ - m_aRect.SetWidth(width); -} - -inline void XFDrawRect::SetHeight(double height) -{ - m_aRect.SetHeight(height); -} - -inline void XFDrawRect::SetCornerRadius(double fCornerRadius) -{ - m_fCornerRadius = fCornerRadius; -} - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx index d4a921bb6b39..b72815ca59b1 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx @@ -83,11 +83,6 @@ public: virtual ~XFDrawStyle(); public: - /** - * @descr Set drawing wrap type. - */ - void SetWrapType(enumXFWrap wrap, sal_Int32 nParagraphs = 0); - /** * @descr Set drawing object border line. */ @@ -138,12 +133,6 @@ private: bool m_bArrowEndCenter; }; -inline void XFDrawStyle::SetWrapType(enumXFWrap wrap, sal_Int32 nParagraphs) -{ - m_eWrap = wrap; - m_nWrapLines = nParagraphs; -} - inline void XFDrawStyle::SetArrowStart(const OUString& start, double size, bool center) { assert(size>0); diff --git a/lotuswordpro/source/filter/xfilter/xfendnote.hxx b/lotuswordpro/source/filter/xfilter/xfendnote.hxx index 1f44edcb1239..78243ec61922 100644 --- a/lotuswordpro/source/filter/xfilter/xfendnote.hxx +++ b/lotuswordpro/source/filter/xfilter/xfendnote.hxx @@ -74,8 +74,6 @@ public: XFEndNote(); public: - void SetLabel(sal_Unicode label); - virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; private: @@ -89,14 +87,7 @@ inline XFEndNote::XFEndNote() m_strID = XFGlobal::GenNoteName(); } -inline void XFEndNote::SetLabel(sal_Unicode label) -{ - sal_Unicode chs[2]; - chs[0] = label; - chs[1] = 0; - m_strLabel = OUString(chs); -} inline void XFEndNote::ToXml(IXFStream *pStrm) { diff --git a/lotuswordpro/source/filter/xfilter/xfentry.hxx b/lotuswordpro/source/filter/xfilter/xfentry.hxx index 919d1f228014..3025ceacffeb 100644 --- a/lotuswordpro/source/filter/xfilter/xfentry.hxx +++ b/lotuswordpro/source/filter/xfilter/xfentry.hxx @@ -82,26 +82,11 @@ public: */ void SetStringValue(const OUString& value); - /** - * @descr Set display string. - */ - void SetStringDisplay(const OUString& display); - - /** - * @descr Set entry name. - */ - void SetEntryName(const OUString& name); - /** * @descr Set entry key. The keys is available only for enumXFEntryAlphabetical. */ void SetKey(const OUString& key1, const OUString& key2=""); - /** - * @descr Set whether it's a main entry. This is available only for enumXFEntryAlphabetical. - */ - void SetMainEntry(bool main); - /** * @descr Set outline level. This is available for enumXFEntryTOC and enumXFEntryUserIndex. */ @@ -130,27 +115,12 @@ inline void XFEntry::SetStringValue(const OUString& value) m_strValue = value; } -inline void XFEntry::SetStringDisplay(const OUString& display) -{ - m_strDisplay = display; -} - -inline void XFEntry::SetEntryName(const OUString& name) -{ - m_strName = name; -} - inline void XFEntry::SetKey(const OUString& key1, const OUString& key2) { m_strKey1 = key1; m_strKey2 = key2; } -inline void XFEntry::SetMainEntry(bool main) -{ - m_bMainEntry = main; -} - inline void XFEntry::SetOutlineLevel(sal_Int32 level) { m_nOutlineLevel = level; diff --git a/lotuswordpro/source/filter/xfilter/xffont.hxx b/lotuswordpro/source/filter/xfilter/xffont.hxx index 676f08aa7efb..d7ada0605cad 100644 --- a/lotuswordpro/source/filter/xfilter/xffont.hxx +++ b/lotuswordpro/source/filter/xfilter/xffont.hxx @@ -186,61 +186,21 @@ public: */ void SetUnderline(enumXFUnderline underline,bool wordByWord=false); - /** - * @descr Set underline color. - */ - void SetUnderlineColor(XFColor color=XFColor(128,128,0)); - /** * @descr Set crossout. */ void SetCrossout(enumXFCrossout cross,bool wordByWord=false); - /** - * @descr Set font relief. - */ - void SetRelief(enumXFRelief relief); - /** * @descr Set font transform type,pls refer to enumXFTransform. */ void SetTransform(enumXFTransform transform); - /** - * @descr Set font emphasize effect. - */ - void SetEmphasize(enumXFEmphasize emphasize, bool top = true); - - /** - * @descr Set outline effect. - */ - void SetOutline(bool outline); - - /** - * @descr Set font shadow. - */ - void SetShadow(bool shadow); - - /** - * @descr Set font blink effect. - */ - void SetBlink(bool blink); - /** * @descr Set upper script or lower script. */ void SetPosition(bool bUpperScript = true, sal_Int16 pos = 33, sal_Int16 scale = 58); - /** - * @descr Set space between chars in percent. - */ - void SetCharSpace(sal_Int16 space); - - /** - * @descr Set char width scale in percent. - */ - void SetWidthScale(sal_Int16 widthScale); - /** * @descr Set font color. */ @@ -258,8 +218,6 @@ public: sal_Int16 GetFontSize(); XFColor GetColor(); - sal_uInt32 GetFlag(){ return m_nFlag; } - void ToXml(IXFStream *pStrm); friend bool operator==(XFFont& f1, XFFont& f2); @@ -396,51 +354,19 @@ inline void XFFont::SetUnderline(enumXFUnderline underline, bool wordByWord) m_nFlag |= XFFONT_FLAG_UNDERLINE; } -inline void XFFont::SetUnderlineColor(XFColor color) -{ - m_aUnderlineColor = color; - m_nFlag |= XFFONT_FLAG_UNDERLINECOLOR; -} - inline void XFFont::SetCrossout(enumXFCrossout cross, bool wordByWord) { m_eCrossout = cross; m_bWordByWord = wordByWord; m_nFlag |= XFFONT_FLAG_CROSSOUT; } -inline void XFFont::SetRelief(enumXFRelief relief) -{ - m_eRelief = relief; - m_nFlag |= XFFONT_FLAG_RELIEF; -} + inline void XFFont::SetTransform(enumXFTransform transform) { m_eTransform = transform; m_nFlag |= XFFONT_FLAG_TRANSFORM; } -inline void XFFont::SetEmphasize(enumXFEmphasize emphasize, bool top) -{ - m_eEmphasize = emphasize; - m_bEmphasizeTop = top; - m_nFlag |= XFFONT_FLAG_EMPHASIZE; -} -inline void XFFont::SetOutline(bool outline) -{ - m_bOutline = outline; - m_nFlag |= XFFONT_FLAG_OUTLINE; -} -inline void XFFont::SetShadow(bool shadow) -{ - m_bShadow = shadow; - m_nFlag |= XFFONT_FLAG_SHADOW; -} -inline void XFFont::SetBlink(bool blink) -{ - m_bBlink = blink; - m_nFlag |= XFFONT_FLAG_BLINK; -} - inline void XFFont::SetPosition(bool bUpperScript, sal_Int16 pos, sal_Int16 scale) { assert(pos>=0&&pos<=100); @@ -460,18 +386,6 @@ inline void XFFont::SetPosition(bool bUpperScript, sal_Int16 pos, sal_Int16 scal } } -inline void XFFont::SetCharSpace(sal_Int16 space) -{ - m_nFlag |= XFFONT_FLAG_CHARSPACE; - m_fCharSpace = space; -} - -inline void XFFont::SetWidthScale(sal_Int16 widthScale) -{ - m_nFlag |= XFFONT_FLAG_WIDTHSCALE; - m_nWidthScale = widthScale; -} - inline void XFFont::SetColor(XFColor& color) { m_nFlag |= XFFONT_FLAG_COLOR; diff --git a/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx b/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx index 7626daf324e8..aa4fc03d5169 100644 --- a/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xffontworkstyle.hxx @@ -68,35 +68,24 @@ class XFFontWorkStyle public: XFFontWorkStyle() : m_nButtonForm(-1), - m_bHideForm(true), - m_fDistance(-0.10), m_eStyleType(enumXFFWOff), - m_eAdjustType(enumXFFWAdjustAutosize), - m_eShadowType(enumXFFWShadowNone) + m_eAdjustType(enumXFFWAdjustAutosize) {} ~XFFontWorkStyle(){} inline void SetButtonForm(sal_Int8 nIndex); - inline void SetHideForm(bool bHide); - inline void SetFWDistance(double fDist); inline void SetFWStyleType(enumXFFWStyle eStyle); inline void SetFWAdjustType(enumXFFWAdjust eAdjust); - inline void SetFWShadowType(enumXFFWShadow eShadow); inline sal_Int8 GetButtonForm() const; - inline double GetFWDistance() const; inline enumXFFWStyle GetStyleType() const; inline enumXFFWAdjust GetAdjustType() const; - inline enumXFFWShadow GetShadowType() const; private: sal_Int8 m_nButtonForm; - bool m_bHideForm; - double m_fDistance; enumXFFWStyle m_eStyleType; enumXFFWAdjust m_eAdjustType; - enumXFFWShadow m_eShadowType; }; inline void XFFontWorkStyle::SetButtonForm(sal_Int8 nIndex) @@ -104,16 +93,6 @@ inline void XFFontWorkStyle::SetButtonForm(sal_Int8 nIndex) m_nButtonForm = nIndex; } -inline void XFFontWorkStyle::SetHideForm(bool bHide) -{ - m_bHideForm = bHide; -} - -inline void XFFontWorkStyle::SetFWDistance(double fDist) -{ - m_fDistance = fDist; -} - inline void XFFontWorkStyle::SetFWStyleType(enumXFFWStyle eStyle) { m_eStyleType = eStyle; @@ -124,19 +103,10 @@ inline void XFFontWorkStyle::SetFWAdjustType(enumXFFWAdjust eAdjust) m_eAdjustType = eAdjust; } -inline void XFFontWorkStyle::SetFWShadowType(enumXFFWShadow eShadow) -{ - m_eShadowType = eShadow; -} - inline sal_Int8 XFFontWorkStyle::GetButtonForm() const { return m_nButtonForm; } -inline double XFFontWorkStyle::GetFWDistance() const -{ - return m_fDistance; -} inline enumXFFWStyle XFFontWorkStyle::GetStyleType() const { @@ -146,10 +116,6 @@ inline enumXFFWAdjust XFFontWorkStyle::GetAdjustType() const { return m_eAdjustType; } -inline enumXFFWShadow XFFontWorkStyle::GetShadowType() const -{ - return m_eShadowType; -} #endif // INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFFONTWORKSTYLE_HXX diff --git a/lotuswordpro/source/filter/xfilter/xffootnote.hxx b/lotuswordpro/source/filter/xfilter/xffootnote.hxx index fe76b5a03b13..bbe4d95f9eea 100644 --- a/lotuswordpro/source/filter/xfilter/xffootnote.hxx +++ b/lotuswordpro/source/filter/xfilter/xffootnote.hxx @@ -75,8 +75,6 @@ public: XFFootNote(); public: - void SetLabel(sal_Unicode label); - virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; private: @@ -89,14 +87,7 @@ inline XFFootNote::XFFootNote() m_strID = XFGlobal::GenNoteName(); } -inline void XFFootNote::SetLabel(sal_Unicode label) -{ - sal_Unicode chs[2]; - chs[0] = label; - chs[1] = 0; - m_strLabel = OUString(chs); -} inline void XFFootNote::ToXml(IXFStream *pStrm) { diff --git a/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx b/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx index dfb9cac31fb7..cecda70b164f 100644 --- a/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx +++ b/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx @@ -68,24 +68,12 @@ public: XFFootnoteConfig(); public: - void SetBodyStyle(const OUString& style); - - void SetCitationStyle(const OUString& style); - - void SetDefaultStyle(const OUString& style); - void SetMasterPage(const OUString& masterPage); - void SetNumberFormat(const OUString& numberFormat); - void SetStartValue(sal_Int32 value=0); void SetRestartOnPage(); - void SetRestartOnChapter(); - - void SetInsertInPage(bool page=true); - void SetNumPrefix(const OUString& numprefix); void SetNumSuffix(const OUString& numsuffix); @@ -125,31 +113,11 @@ inline XFFootnoteConfig::XFFootnoteConfig() m_bIsFootnote = true; } -inline void XFFootnoteConfig::SetBodyStyle(const OUString& style) -{ - m_strBodyStyle = style; -} - -inline void XFFootnoteConfig::SetCitationStyle(const OUString& style) -{ - m_strCitationStyle = style; -} - -inline void XFFootnoteConfig::SetDefaultStyle(const OUString& style) -{ - m_strDefaultStyle = style; -} - inline void XFFootnoteConfig::SetMasterPage(const OUString& masterPage) { m_strMasterPage = masterPage; } -inline void XFFootnoteConfig::SetNumberFormat(const OUString& numberFormat) -{ - m_strNumFmt = numberFormat; -} - inline void XFFootnoteConfig::SetStartValue(sal_Int32 value) { if( value<0 ) @@ -162,16 +130,6 @@ inline void XFFootnoteConfig::SetRestartOnPage() m_nRestartType = 0; } -inline void XFFootnoteConfig::SetRestartOnChapter() -{ - m_nRestartType = 1; -} - -inline void XFFootnoteConfig::SetInsertInPage(bool page) -{ - m_bInsertInPage = page; -} - inline void XFFootnoteConfig::SetNumPrefix(const OUString& numprefix) { m_strNumPrefix = numprefix; diff --git a/lotuswordpro/source/filter/xfilter/xfframe.hxx b/lotuswordpro/source/filter/xfilter/xfframe.hxx index fb14739b2acb..6d8ee6135595 100644 --- a/lotuswordpro/source/filter/xfilter/xfframe.hxx +++ b/lotuswordpro/source/filter/xfilter/xfframe.hxx @@ -136,11 +136,6 @@ public: */ void SetMinHeight(double minHeight); - /** - * @descr Set frame max-height. - */ - void SetMaxHeight(double minHeight); - /** * @descr Set frame position. */ @@ -231,13 +226,6 @@ inline void XFFrame::SetMinHeight(double minHeight) m_nFlag &= XFFRAME_FLAG_MINHEIGHT; } -inline void XFFrame::SetMaxHeight(double maxHeight) -{ - m_fMaxHeight = maxHeight; - m_nFlag |= XFFRAME_FLAG_MAXHEIGHT; - m_nFlag &= XFFRAME_FLAG_MAXHEIGHT; -} - inline void XFFrame::SetPosition(double x, double y, double width, double height) { m_aRect.SetStartPoint(XFPoint(x,y)); diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx index c7d8c804fc35..1b26d252f085 100644 --- a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx @@ -141,11 +141,6 @@ public: */ void SetYPosType(enumXFFrameYPos pos, enumXFFrameYRel rel); - /** - * @descr Set frame background. - */ - void SetBackGround(bool bBackground); - void SetTransparency(sal_Int16 nTransparency); virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE; @@ -235,11 +230,6 @@ inline void XFFrameStyle::SetYPosType(enumXFFrameYPos pos, enumXFFrameYRel rel) m_eYRel = rel; } -inline void XFFrameStyle::SetBackGround(bool bBackground) -{ - m_bBackground = bBackground; -} - inline void XFFrameStyle::SetTransparency(sal_Int16 nTransparency) { m_nTransparency = nTransparency; diff --git a/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx b/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx index d45076ad7b56..d5dcb62d5738 100644 --- a/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx +++ b/lotuswordpro/source/filter/xfilter/xfhyperlink.hxx @@ -70,10 +70,6 @@ public: void SetText(const OUString& text); - void SetName(const OUString& name); - - void SetTargetFrame(const OUString& frame="_self"); - virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; private: @@ -93,16 +89,6 @@ inline void XFHyperlink::SetHRef(const OUString& href) m_strHRef = href; } -inline void XFHyperlink::SetName(const OUString& name) -{ - m_strName = name; -} - -inline void XFHyperlink::SetTargetFrame(const OUString& frame) -{ - m_strFrame = frame; -} - inline void XFHyperlink::SetText(const OUString& text) { m_strText = text; diff --git a/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx b/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx index 8bf18b350678..b45f4375d39f 100644 --- a/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfimagestyle.hxx @@ -73,22 +73,8 @@ public: void SetContrast(sal_Int32 contrast); - void SetGamma(sal_Int32 gamma); - - void SetTransparent(sal_Int32 transparent); - - void SetAdjustRed(sal_Int32 red); - - void SetAdjustGreen(sal_Int32 green); - - void SetAdjustBlue(sal_Int32 blue); - void SetClip(double left, double right, double top, double bottom); - void SetFlip(bool hori, bool vert); - - void SetColorMode(enumXFColorMode mode); - virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; private: @@ -118,31 +104,6 @@ inline void XFImageStyle::SetContrast(sal_Int32 contrast) m_nContrast = contrast; } -inline void XFImageStyle::SetGamma(sal_Int32 gamma) -{ - m_nGamma = gamma; -} - -inline void XFImageStyle::SetTransparent(sal_Int32 transparent) -{ - m_nTransparent = transparent; -} - -inline void XFImageStyle::SetAdjustRed(sal_Int32 red) -{ - m_nAdjustRed = red; -} - -inline void XFImageStyle::SetAdjustGreen(sal_Int32 green) -{ - m_nAdjustGreen = green; -} - -inline void XFImageStyle::SetAdjustBlue(sal_Int32 blue) -{ - m_nAdjustBlue = blue; -} - inline void XFImageStyle::SetClip(double left, double right, double top, double bottom) { m_fClipLeft = left; @@ -151,11 +112,5 @@ inline void XFImageStyle::SetClip(double left, double right, double top, double m_fClipBottom = bottom; } -inline void XFImageStyle::SetFlip(bool hori, bool vert) -{ - m_bHoriFlip = hori; - m_bVertFlip = vert; -} - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfindex.hxx b/lotuswordpro/source/filter/xfilter/xfindex.hxx index 6d09ac5ecd60..bacc0e197bb7 100644 --- a/lotuswordpro/source/filter/xfilter/xfindex.hxx +++ b/lotuswordpro/source/filter/xfilter/xfindex.hxx @@ -104,10 +104,6 @@ public: */ void AddTextEntry(const OUString& sSpan, const OUString& styleName = ""); - /** - * @descr clear all index template parts. - */ - void Clear(); virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; private: @@ -226,11 +222,6 @@ inline void XFIndexTemplate::AddTextEntry(const OUString& sText, const OUString& m_aTextEntries[nLen] = sText; } -inline void XFIndexTemplate::Clear() -{ - m_aEntries.clear(); -} - inline void XFIndex::SetIndexType(enumXFIndex type) { m_eType = type; diff --git a/lotuswordpro/source/filter/xfilter/xflineheight.hxx b/lotuswordpro/source/filter/xfilter/xflineheight.hxx index 21af420a8bd5..6bfcf692e0ad 100644 --- a/lotuswordpro/source/filter/xfilter/xflineheight.hxx +++ b/lotuswordpro/source/filter/xfilter/xflineheight.hxx @@ -82,8 +82,6 @@ public: void ToXml(IXFStream *pStrm); - enumLHType GetType(); - friend bool operator==(XFLineHeight& indent1, XFLineHeight& indent2); friend bool operator!=(XFLineHeight& indent1, XFLineHeight& indent2); private: @@ -122,11 +120,6 @@ inline void XFLineHeight::Reset() m_Value.m_fValue = 0; } -inline enumLHType XFLineHeight::GetType() -{ - return m_eType; -} - inline void XFLineHeight::ToXml(IXFStream *pStrm) { IXFAttrList *pAttrList = pStrm->GetAttrList(); diff --git a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx index d81674f67ff0..aef35c1e6b84 100644 --- a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx +++ b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx @@ -74,18 +74,10 @@ public: void SetNumberIncrement(sal_Int32 increment); - void SetSeparator(sal_Int32 increment, const OUString& separator); - - void SetNumberFormat(const OUString& numfmt = "1"); - - void SetTextStyle(const OUString& style); - void SetRestartOnPage(bool restart = true); void SetCountEmptyLines(bool empty = true); - void SetCountFrameLines(bool frame = true); - virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; private: @@ -127,22 +119,6 @@ inline void XFLineNumberConfig::SetNumberIncrement(sal_Int32 increment) m_nIncrement = increment; } -inline void XFLineNumberConfig::SetSeparator(sal_Int32 increment, const OUString& separator) -{ - m_nSepIncrement = increment; - m_strSeparator = separator; -} - -inline void XFLineNumberConfig::SetNumberFormat(const OUString& numfmt) -{ - m_strNumFmt = numfmt; -} - -inline void XFLineNumberConfig::SetTextStyle(const OUString& style) -{ - m_strTextStyle = style; -} - inline void XFLineNumberConfig::SetRestartOnPage(bool restart) { m_bRestartOnPage = restart; @@ -153,11 +129,6 @@ inline void XFLineNumberConfig::SetCountEmptyLines(bool empty) m_bCountEmptyLines = empty; } -inline void XFLineNumberConfig::SetCountFrameLines(bool frame) -{ - m_bCountFrameLines = frame; -} - inline void XFLineNumberConfig::ToXml(IXFStream *pStrm) { IXFAttrList *pAttrList = pStrm->GetAttrList(); diff --git a/lotuswordpro/source/filter/xfilter/xfmargins.hxx b/lotuswordpro/source/filter/xfilter/xfmargins.hxx index 56e6077e72ff..a79a682990d6 100644 --- a/lotuswordpro/source/filter/xfilter/xfmargins.hxx +++ b/lotuswordpro/source/filter/xfilter/xfmargins.hxx @@ -79,9 +79,7 @@ public: void SetBottom(double bottom); double GetLeft(); - double GetRight(); double GetTop(); - double GetBottom(); void ToXml(IXFStream *pStrm); @@ -125,20 +123,10 @@ inline double XFMargins::GetLeft() return m_fLeft; } -inline double XFMargins::GetRight() -{ - return m_fRight; -} - inline double XFMargins::GetTop() { return m_fTop; } -inline double XFMargins::GetBottom() -{ - return m_fBottom; -} - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx b/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx index 739c1a31036d..4c32c41abbd2 100644 --- a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx @@ -73,10 +73,6 @@ public: public: void SetDecimalDigits(sal_Int32 decimal); - void SetMinInteger(sal_Int32 integer); - - void SetMinExponent(sal_Int32 exponent); - void SetGroup(bool group = true); void SetColor(const XFColor& color); @@ -90,8 +86,6 @@ public: void SetNumberType(enumXFNumberType type); - void SetCurrencySymbol(bool post, const OUString& symbol, bool bShowSpace=false); - virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE; virtual bool Equal(IXFStyle *pStyle) SAL_OVERRIDE; @@ -132,16 +126,6 @@ inline void XFNumberStyle::SetDecimalDigits(sal_Int32 decimal) m_nDecimalDigits = decimal; } -inline void XFNumberStyle::SetMinInteger(sal_Int32 integer) -{ - m_nMinInteger = integer; -} - -inline void XFNumberStyle::SetMinExponent(sal_Int32 exponent) -{ - m_nMinExponent = exponent; -} - inline void XFNumberStyle::SetNegativeStyle(const OUString& prefix, const OUString& suffix, const XFColor& color) { m_bRedIfNegative = true; @@ -175,19 +159,7 @@ inline void XFNumberStyle::SetSurfix(const OUString& surfix) m_strSuffix = surfix; } -inline void XFNumberStyle::SetCurrencySymbol(bool post, const OUString& symbol, bool bShowSpace) -{ - m_bCurrencySymbolPost = post; - m_strCurrencySymbol = symbol; - - if( bShowSpace ) - { - if( post ) - m_strCurrencySymbol = " " + m_strCurrencySymbol; - else - m_strCurrencySymbol += " "; - } -} + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx b/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx index 3788d08afb27..1173d2a26531 100644 --- a/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx +++ b/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx @@ -89,8 +89,6 @@ public: void SetPageUsage(enumXFPageUsage usage); - void SetPrintOrient(bool bUseWidth=true); - void SetBorders(XFBorders *pBorders); void SetShadow(XFShadow *pShadow); @@ -152,11 +150,6 @@ inline void XFPageMaster::SetPageUsage(enumXFPageUsage usage) this->m_eUsage = usage; } -inline void XFPageMaster::SetPrintOrient(bool bUseWidth) -{ - m_bPrintOrient = bUseWidth; -} - inline void XFPageMaster::SetTextDir(enumXFTextDir dir) { m_eTextDir = dir; diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx index 8d965df88065..e90f94195187 100644 --- a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx @@ -128,10 +128,6 @@ public: */ void SetIndent(double indent ); - /** - * @descr Set line number style. - */ - void SetLineNumber(bool show, sal_Int32 restart=1); /** * @descr Set the pading of the paragraph.This is the distance between the border and the top of the text. @@ -152,16 +148,6 @@ public: */ void SetAlignType(enumXFAlignType eAlign); - enumXFAlignType GetAlighType(); - - /** - * @descr Set last line alignment property of the paragraph. - * @param eAlign alignment type,left,right,center or justify. - eJustSingleWord If chars of the last-line'word should be - stretched. - */ - void SetLastLineAlign(enumXFAlignType align,bool bJustSingleWord = false); - /** * @descr Set the shadow of the paragraph.there is 4 positions, you can find it in the definition of enumShadowPos. @@ -210,11 +196,6 @@ public: */ void SetBreaks(enumXFBreaks breaks); - /** - * @descr For paragraph numbering. - */ - void SetPageNumber(sal_Int32 num); - /** * @descr Add a tab style. */ @@ -225,14 +206,6 @@ public: */ void ClearTabStyles(); - /** - * descr set the paragraph to be in the same page with the next paragraph. - * If that can't be insured,the paragraph will start with a new page. - */ - void SetKeepWithNext(bool keepWithNext); - - sal_uInt32 GetFlag(){ return m_nFlag; } - XFMargins& GetMargins(){return m_aMargin;} virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE; @@ -281,18 +254,6 @@ inline void XFParaStyle::SetBreaks(enumXFBreaks breaks) m_aBreaks.SetBreakType(breaks); } -inline void XFParaStyle::SetPageNumber(sal_Int32 num) -{ - assert(num>0); - m_nPageNumber = num; -} - -inline void XFParaStyle::SetLineNumber(bool show, sal_Int32 restart) -{ - m_bNumberLines = show; - m_nLineNumberRestart = restart; -} - inline void XFParaStyle::SetPadding(double left, double right, double top, double bottom) { m_aPadding.SetLeft(left); @@ -315,17 +276,6 @@ inline void XFParaStyle::SetAlignType(enumXFAlignType eAlign) m_eAlignType = eAlign; } -inline void XFParaStyle::SetLastLineAlign(enumXFAlignType align, bool bJustSingleWord) -{ - m_eLastLineAlign = align; - m_bJustSingleWord = bJustSingleWord; -} - -inline void XFParaStyle::SetKeepWithNext(bool keep) -{ - m_bKeepWithNext = keep; -} - inline void XFParaStyle::ClearTabStyles() { m_aTabs.Reset(); @@ -336,10 +286,6 @@ inline OUString XFParaStyle::GetMasterPage() return m_strMasterPage; } -inline enumXFAlignType XFParaStyle::GetAlighType() -{ - return m_eAlignType; -} class XFDefaultParaStyle : public XFStyle { diff --git a/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx b/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx index 78eca9cd372a..e5cd6513feab 100644 --- a/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx @@ -78,8 +78,6 @@ public: void SetMinRowHeight(double height); - void SetBackColor(XFColor& color); - virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE; virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; @@ -101,10 +99,6 @@ inline void XFRowStyle::SetMinRowHeight(double height) m_fMinHeight = height; } -inline void XFRowStyle::SetBackColor(XFColor& color) -{ - m_aBackColor = color; -} inline double XFRowStyle::GetRowHeight() { if (m_fMinHeight > FLOAT_MIN) diff --git a/lotuswordpro/source/filter/xfilter/xfstyle.cxx b/lotuswordpro/source/filter/xfilter/xfstyle.cxx index a9c46e27674b..7619ad8e08df 100644 --- a/lotuswordpro/source/filter/xfilter/xfstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfstyle.cxx @@ -93,11 +93,6 @@ enumXFStyle XFStyle::GetStyleFamily() return enumXFStyleUnknown; } -void XFStyle::SetStyleFamily(enumXFStyle family) -{ - m_enumFamily = family; -} - bool XFStyle::Equal(IXFStyle * /*pStyle*/) { return false; diff --git a/lotuswordpro/source/filter/xfilter/xfstyle.hxx b/lotuswordpro/source/filter/xfilter/xfstyle.hxx index 4ad31970ecc4..a573e1e2a537 100644 --- a/lotuswordpro/source/filter/xfilter/xfstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfstyle.hxx @@ -99,11 +99,6 @@ public: */ virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE; - /** - * @descr set style family. - */ - virtual void SetStyleFamily(enumXFStyle family) SAL_OVERRIDE; - /** * @descr decide whether two style are equal. */ diff --git a/lotuswordpro/source/filter/xfilter/xftable.hxx b/lotuswordpro/source/filter/xfilter/xftable.hxx index 9dffb6f533e5..844d685966f2 100644 --- a/lotuswordpro/source/filter/xfilter/xftable.hxx +++ b/lotuswordpro/source/filter/xfilter/xftable.hxx @@ -83,12 +83,6 @@ public: void AddHeaderRow(XFRow *pRow); - void SetDefaultCellStyle(const OUString& style); - - void SetDefaultRowStyle(const OUString& style); - - void SetDefaultColStyle(const OUString& style); - public: void SetOwnerCell(XFCell *pCell); @@ -102,8 +96,6 @@ public: bool IsSubTable(); - void Normalize(); - enumXFContent GetContentType() SAL_OVERRIDE; virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; @@ -141,21 +133,6 @@ inline bool XFTable::IsSubTable() return m_bSubTable; } -inline void XFTable::SetDefaultCellStyle(const OUString& style) -{ - m_strDefCellStyle = style; -} - -inline void XFTable::SetDefaultRowStyle(const OUString& style) -{ - m_strDefRowStyle = style; -} - -inline void XFTable::SetDefaultColStyle(const OUString& style) -{ - m_strDefColStyle = style; -} - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xftablestyle.hxx b/lotuswordpro/source/filter/xfilter/xftablestyle.hxx index 335202389852..bf11c75120e0 100644 --- a/lotuswordpro/source/filter/xfilter/xftablestyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xftablestyle.hxx @@ -81,14 +81,10 @@ public: void SetShadow(enumXFShadowPos pos, double offset = 0.18, XFColor color=XFColor(128,128,0) ); - void SetMargins(double left=-1, double right=-1, double top=-1, double bottom=-1); - void SetBackColor(XFColor& color); void SetBackImage(XFBGImage *pImage); - void SetBreaks(enumXFBreaks breaks); - virtual void ToXml(IXFStream *pStrm) SAL_OVERRIDE; virtual enumXFStyle GetStyleFamily() SAL_OVERRIDE; @@ -127,28 +123,11 @@ inline void XFTableStyle::SetShadow(enumXFShadowPos pos, double offset, XFColor m_aShadow.SetPosition(pos); } -inline void XFTableStyle::SetMargins(double left, double right, double top, double bottom) -{ - if( left != -1 ) - m_aMargins.SetLeft(left); - if( right != -1 ) - m_aMargins.SetRight(right); - if( top != -1 ) - m_aMargins.SetTop(top); - if( bottom != -1 ) - m_aMargins.SetBottom(bottom); -} - inline void XFTableStyle::SetBackColor(XFColor& color) { m_aBackColor = color; } -inline void XFTableStyle::SetBreaks(enumXFBreaks breaks) -{ - m_aBreaks.SetBreakType(breaks); -} - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit