diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-09-25 13:31:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-09-26 03:04:45 +0200 |
| commit | 4e67474a6e4dbfeff5316dcf08b44cfead148609 (patch) | |
| tree | 630190f52de6572a46bb13b9ae6ae5b5709e64a7 /lotuswordpro | |
| parent | 3b13f813da6ad3bd3e4f9dc24b7deb84ea557063 (diff) | |
loplugin:constmethod in framework..lotuswordpro
Change-Id: I14a3855a75cf081d86c2a404966db38c617c0256
Reviewed-on: https://gerrit.libreoffice.org/79541
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'lotuswordpro')
92 files changed, 413 insertions, 413 deletions
diff --git a/lotuswordpro/inc/lwpatomholder.hxx b/lotuswordpro/inc/lwpatomholder.hxx index b038289a2d6b..e6f4ae57377c 100644 --- a/lotuswordpro/inc/lwpatomholder.hxx +++ b/lotuswordpro/inc/lwpatomholder.hxx @@ -76,9 +76,9 @@ public: void ReadPathAtom(LwpObjectStream *pStrm); void Skip(LwpObjectStream *pStrm); const OUString& str() const {return m_String;} - inline bool HasValue(); + inline bool HasValue() const; }; -inline bool LwpAtomHolder::HasValue() +inline bool LwpAtomHolder::HasValue() const { return (m_nAtom != BAD_ATOM); } diff --git a/lotuswordpro/inc/lwpcolor.hxx b/lotuswordpro/inc/lwpcolor.hxx index d6d3b02a63b7..3ca8698800ad 100644 --- a/lotuswordpro/inc/lwpcolor.hxx +++ b/lotuswordpro/inc/lwpcolor.hxx @@ -73,12 +73,12 @@ public: LwpColor():m_nRed(0), m_nGreen(0), m_nBlue(0), m_nExtra(0){} public: void Read(LwpObjectStream *pStrm); - sal_uInt16 GetRed(); - sal_uInt16 GetGreen(); - sal_uInt16 GetBlue(); - bool IsValidColor(); + sal_uInt16 GetRed() const; + sal_uInt16 GetGreen() const; + sal_uInt16 GetBlue() const; + bool IsValidColor() const; sal_uInt32 To24Color(); - bool IsTransparent(); + bool IsTransparent() const; private: sal_uInt16 m_nRed; // When extra is AGLRGB_INDEX, m_nRed holds the sal_uInt16 m_nGreen; // hi 16 bits and m_nGreen holds the lo 16 bits of @@ -99,23 +99,23 @@ private: AGLRGB_TRANSPARENT = 100 }; }; -inline sal_uInt16 LwpColor::GetRed() +inline sal_uInt16 LwpColor::GetRed() const { return m_nRed; } -inline sal_uInt16 LwpColor::GetGreen() +inline sal_uInt16 LwpColor::GetGreen() const { return m_nGreen; } -inline sal_uInt16 LwpColor::GetBlue() +inline sal_uInt16 LwpColor::GetBlue() const { return m_nBlue; } -inline bool LwpColor::IsValidColor() +inline bool LwpColor::IsValidColor() const { return ((m_nExtra!=AGLRGB_INVALID) && (m_nExtra!=AGLRGB_TRANSPARENT)); } -inline bool LwpColor::IsTransparent() +inline bool LwpColor::IsTransparent() const { return (m_nExtra==AGLRGB_TRANSPARENT); } diff --git a/lotuswordpro/inc/lwpfilehdr.hxx b/lotuswordpro/inc/lwpfilehdr.hxx index ef444b12eb2b..2bb49127ab8f 100644 --- a/lotuswordpro/inc/lwpfilehdr.hxx +++ b/lotuswordpro/inc/lwpfilehdr.hxx @@ -74,10 +74,10 @@ private: //data member public: static sal_uInt16 m_nFileRevision; void Read(LwpSvStream *pStrm); - sal_uInt32 GetRootIndexOffset(); + sal_uInt32 GetRootIndexOffset() const; LwpObjectID& GetDocID(); }; -inline sal_uInt32 LwpFileHeader::GetRootIndexOffset() +inline sal_uInt32 LwpFileHeader::GetRootIndexOffset() const { return m_nRootIndexOffset; } diff --git a/lotuswordpro/inc/lwpfont.hxx b/lotuswordpro/inc/lwpfont.hxx index 866775485234..cc1dc713347e 100644 --- a/lotuswordpro/inc/lwpfont.hxx +++ b/lotuswordpro/inc/lwpfont.hxx @@ -80,7 +80,7 @@ public: LwpFontTableEntry(){} public: void Read(LwpObjectStream *pStrm); - OUString const & GetFaceName(); + OUString const & GetFaceName() const; private: LwpAtomHolder m_WindowsFaceName; //font face name under windows LwpAtomHolder m_FaceName; //font face name @@ -117,11 +117,11 @@ public: {} public: void Read(LwpObjectStream *pStrm); - sal_uInt16 GetFaceID(){return m_nFaceName;} - sal_uInt16 GetAltFaceID(){return m_nAltFaceName;} + sal_uInt16 GetFaceID() const {return m_nFaceName;} + sal_uInt16 GetAltFaceID() const {return m_nAltFaceName;} void Override(rtl::Reference<XFFont> const & pFont); - inline bool IsFaceNameOverridden(); - inline bool IsAltFaceNameOverridden(); + inline bool IsFaceNameOverridden() const; + inline bool IsAltFaceNameOverridden() const; private: //Data of CFontDescriptionOverrideBase sal_uInt8 m_nOverrideBits; @@ -148,9 +148,9 @@ private: | TIGHTNESS | FACENAME | BKCOLOR) }; - inline bool IsPointSizeOverridden(); - inline bool IsColorOverridden(); - inline bool IsBackgroundColorOverridden(); + inline bool IsPointSizeOverridden() const; + inline bool IsColorOverridden() const; + inline bool IsBackgroundColorOverridden() const; //TODO // inline sal_Bool IsTightnessOverridden(); // inline sal_Bool IsAnythingOverridden(); @@ -230,14 +230,14 @@ private: ALL_ATTRS2 = CASE | UNDER }; bool Is(sal_uInt16 Attr); - bool IsBoldOverridden(); - bool IsItalicOverridden(); - bool IsStrikeThruOverridden(); - bool IsSmallCapsOverridden(); - bool IsSuperOverridden(); - bool IsSubOverridden(); - bool IsUnderlineOverridden(); - bool IsCaseOverridden(); + bool IsBoldOverridden() const; + bool IsItalicOverridden() const; + bool IsStrikeThruOverridden() const; + bool IsSmallCapsOverridden() const; + bool IsSuperOverridden() const; + bool IsSubOverridden() const; + bool IsUnderlineOverridden() const; + bool IsCaseOverridden() const; }; diff --git a/lotuswordpro/inc/lwpfoundry.hxx b/lotuswordpro/inc/lwpfoundry.hxx index 96c487c35c98..ae91294885b2 100644 --- a/lotuswordpro/inc/lwpfoundry.hxx +++ b/lotuswordpro/inc/lwpfoundry.hxx @@ -103,7 +103,7 @@ private: LwpObjectID m_TableRange; public: void Read(LwpObjectStream *pStrm); - const LwpObjectID& GetTableRangeID(){ return m_TableRange;} + const LwpObjectID& GetTableRangeID() const { return m_TableRange;} }; class LwpBulletManager diff --git a/lotuswordpro/inc/lwpfrib.hxx b/lotuswordpro/inc/lwpfrib.hxx index 6ff3cad39a98..753bdc5999cf 100644 --- a/lotuswordpro/inc/lwpfrib.hxx +++ b/lotuswordpro/inc/lwpfrib.hxx @@ -93,7 +93,7 @@ public: virtual void Read(LwpObjectStream* pObjStrm, sal_uInt16 len); LwpFrib* GetNext(){return m_pNext;} void SetNext(LwpFrib* next){m_pNext = next;} - sal_uInt8 GetType() { return m_nFribType;} + sal_uInt8 GetType() const { return m_nFribType;} OUString GetEditor(); XFColor GetHighlightColor(); protected: @@ -105,17 +105,17 @@ protected: OUString m_StyleName; public: bool m_ModFlag; - const OUString& GetStyleName(){return m_StyleName;} + const OUString& GetStyleName() const {return m_StyleName;} void SetModifiers(ModifierInfo* pModifiers); ModifierInfo* GetModifiers(){return m_pModifiers.get();} virtual void RegisterStyle(LwpFoundry* pFoundry); bool HasNextFrib(); void ConvertChars(XFContentContainer* pXFPara,const OUString& text); - void ConvertHyperLink(XFContentContainer* pXFPara,LwpHyperlinkMgr* pHyperlink,const OUString& text); + void ConvertHyperLink(XFContentContainer* pXFPara, const LwpHyperlinkMgr* pHyperlink,const OUString& text); rtl::Reference<XFFont> GetFont(); - sal_uInt8 GetRevisionType(){return m_nRevisionType;} - bool GetRevisionFlag(){return m_bRevisionFlag;} + sal_uInt8 GetRevisionType() const {return m_nRevisionType;} + bool GetRevisionFlag() const {return m_bRevisionFlag;} enum{ REV_INSERT =0, REV_DELETE = 1, diff --git a/lotuswordpro/inc/lwpobj.hxx b/lotuswordpro/inc/lwpobj.hxx index df38746f49f7..0cb7b428e28f 100644 --- a/lotuswordpro/inc/lwpobj.hxx +++ b/lotuswordpro/inc/lwpobj.hxx @@ -133,7 +133,7 @@ public: LwpFoundry* GetFoundry(){return m_pFoundry;} void SetFoundry(LwpFoundry* pFoundry){m_pFoundry = pFoundry;} LwpObjectID& GetObjectID(){ return m_ObjHdr.GetID();} - sal_uInt32 GetTag() { return m_ObjHdr.GetTag();} + sal_uInt32 GetTag() const { return m_ObjHdr.GetTag();} }; #endif diff --git a/lotuswordpro/inc/lwpobjhdr.hxx b/lotuswordpro/inc/lwpobjhdr.hxx index 12c4169bf8e8..a1dc885dfcbd 100644 --- a/lotuswordpro/inc/lwpobjhdr.hxx +++ b/lotuswordpro/inc/lwpobjhdr.hxx @@ -108,17 +108,17 @@ private: public: bool Read(LwpSvStream &pStrm); - inline sal_uInt32 GetTag(); - inline sal_uInt32 GetSize(); + inline sal_uInt32 GetTag() const; + inline sal_uInt32 GetSize() const; inline LwpObjectID& GetID(); - inline bool IsCompressed(); + inline bool IsCompressed() const; }; -inline sal_uInt32 LwpObjectHeader::GetTag() +inline sal_uInt32 LwpObjectHeader::GetTag() const { return m_nTag; } -inline sal_uInt32 LwpObjectHeader::GetSize() +inline sal_uInt32 LwpObjectHeader::GetSize() const { return m_nSize; } @@ -126,7 +126,7 @@ inline LwpObjectID& LwpObjectHeader::GetID() { return m_ID; } -inline bool LwpObjectHeader::IsCompressed() +inline bool LwpObjectHeader::IsCompressed() const { return m_bCompressed; } diff --git a/lotuswordpro/inc/lwpobjstrm.hxx b/lotuswordpro/inc/lwpobjstrm.hxx index bbcfd3af2a91..0e702bb96a34 100644 --- a/lotuswordpro/inc/lwpobjstrm.hxx +++ b/lotuswordpro/inc/lwpobjstrm.hxx @@ -88,7 +88,7 @@ private: public: sal_uInt16 remainingSize() const; sal_uInt16 QuickRead(void* buf, sal_uInt16 len); - sal_uInt16 GetPos() { return m_nReadPos; } + sal_uInt16 GetPos() const { return m_nReadPos; } void SeekRel(sal_uInt16 pos); void Seek( sal_uInt16 pos); void SkipExtra(); diff --git a/lotuswordpro/inc/lwpoverride.hxx b/lotuswordpro/inc/lwpoverride.hxx index 19d059616b87..036492e518d1 100644 --- a/lotuswordpro/inc/lwpoverride.hxx +++ b/lotuswordpro/inc/lwpoverride.hxx @@ -131,7 +131,7 @@ public: inline sal_uInt16 GetHideLevels() const; - bool IsHighlight(); + bool IsHighlight() const; private: LwpTextAttributeOverride(LwpTextAttributeOverride const& rOther); @@ -178,12 +178,12 @@ public: void Override(LwpBulletOverride* pOther); - inline bool IsSilverBulletOverridden(); - inline bool IsSkipOverridden(); - inline bool IsRightAlignedOverridden(); - inline bool IsSkip(); - inline bool IsRightAligned(); - inline bool IsEditable(); + inline bool IsSilverBulletOverridden() const; + inline bool IsSkipOverridden() const; + inline bool IsRightAlignedOverridden() const; + inline bool IsSkip() const; + inline bool IsRightAligned() const; + inline bool IsEditable() const; void OverrideSilverBullet(LwpObjectID aID); void OverrideSkip(bool bOver); @@ -193,7 +193,7 @@ public: inline void RevertSkip(); inline void RevertRightAligned(); - bool IsInValid(){return m_bIsNull;} + bool IsInValid() const {return m_bIsNull;} private: LwpBulletOverride(LwpBulletOverride const& rOther); @@ -217,32 +217,32 @@ inline const LwpObjectID& LwpBulletOverride::GetSilverBullet() const return m_SilverBullet; } -inline bool LwpBulletOverride::IsSilverBulletOverridden() +inline bool LwpBulletOverride::IsSilverBulletOverridden() const { return ((m_nOverride & BO_SILVERBULLET) != 0); } -inline bool LwpBulletOverride::IsSkipOverridden() +inline bool LwpBulletOverride::IsSkipOverridden() const { return ((m_nOverride & BO_SKIP) != 0); } -inline bool LwpBulletOverride::IsRightAlignedOverridden() +inline bool LwpBulletOverride::IsRightAlignedOverridden() const { return ((m_nOverride & BO_RIGHTALIGN) != 0); } -inline bool LwpBulletOverride::IsSkip() +inline bool LwpBulletOverride::IsSkip() const { return ((m_nValues & BO_SKIP) != 0); } -inline bool LwpBulletOverride::IsEditable() +inline bool LwpBulletOverride::IsEditable() const { return ((m_nValues & BO_EDITABLE) != 0); } -inline bool LwpBulletOverride::IsRightAligned() +inline bool LwpBulletOverride::IsRightAligned() const { return ((m_nValues & BO_RIGHTALIGN) != 0); } @@ -283,7 +283,7 @@ public: ALIGN_SQUEEZE = 7 }; - AlignType GetAlignType(){ return m_nAlignType; } + AlignType GetAlignType() const { return m_nAlignType; } void Override(LwpAlignmentOverride* other); void OverrideAlignment(AlignType val); @@ -389,8 +389,8 @@ public: inline double GetLeft() const; inline double GetRight() const; - sal_uInt16 GetRelative(); - bool IsUseRelative(); + sal_uInt16 GetRelative() const; + bool IsUseRelative() const; void Override(LwpIndentOverride* other); void OverrideIndentAll(sal_Int32 val); void OverrideIndentFirst(sal_Int32 val); diff --git a/lotuswordpro/inc/xfilter/xfbookmark.hxx b/lotuswordpro/inc/xfilter/xfbookmark.hxx index 2c2a684f2bd9..1dd473f94c44 100644 --- a/lotuswordpro/inc/xfilter/xfbookmark.hxx +++ b/lotuswordpro/inc/xfilter/xfbookmark.hxx @@ -78,9 +78,9 @@ public: m_bStart = isStart; } - const OUString& GetDivision(){return m_strDivision;} + const OUString& GetDivision() const {return m_strDivision;} void SetDivision(const OUString& sDivName){m_strDivision = sDivName;} - const OUString& GetName(){return m_strName;} + const OUString& GetName() const {return m_strName;} public: /** diff --git a/lotuswordpro/inc/xfilter/xfcell.hxx b/lotuswordpro/inc/xfilter/xfcell.hxx index 9199b5a1aba1..2bdc97824323 100644 --- a/lotuswordpro/inc/xfilter/xfcell.hxx +++ b/lotuswordpro/inc/xfilter/xfcell.hxx @@ -134,7 +134,7 @@ public: /** * @descr return cell column span property. */ - sal_Int32 GetColSpaned(); + sal_Int32 GetColSpaned() const; /** * @descr Output cell as xml element. @@ -186,7 +186,7 @@ inline void XFCell::SetOwnerRow(XFRow *pRow) m_pOwnerRow = pRow; } -inline sal_Int32 XFCell::GetColSpaned() +inline sal_Int32 XFCell::GetColSpaned() const { return m_nColSpaned; } diff --git a/lotuswordpro/inc/xfilter/xfcolstyle.hxx b/lotuswordpro/inc/xfilter/xfcolstyle.hxx index 563fd0134031..774a2e636941 100644 --- a/lotuswordpro/inc/xfilter/xfcolstyle.hxx +++ b/lotuswordpro/inc/xfilter/xfcolstyle.hxx @@ -82,7 +82,7 @@ public: /** * @descr return column width. */ - double GetWidth(); + double GetWidth() const; virtual enumXFStyle GetStyleFamily() override; @@ -100,7 +100,7 @@ inline void XFColStyle::SetWidth(double width) m_fWidth = width; } -inline double XFColStyle::GetWidth() +inline double XFColStyle::GetWidth() const { return m_fWidth; } diff --git a/lotuswordpro/inc/xfilter/xfcontent.hxx b/lotuswordpro/inc/xfilter/xfcontent.hxx index 38021b4fcd7a..8cb5be5da2c6 100644 --- a/lotuswordpro/inc/xfilter/xfcontent.hxx +++ b/lotuswordpro/inc/xfilter/xfcontent.hxx @@ -91,7 +91,7 @@ public: /** * @short: return the style name. */ - const OUString& GetStyleName() {return m_strStyleName;} + const OUString& GetStyleName() const {return m_strStyleName;} void DoToXml(IXFStream* stream) { diff --git a/lotuswordpro/inc/xfilter/xfdrawlinestyle.hxx b/lotuswordpro/inc/xfilter/xfdrawlinestyle.hxx index 20df6dc436bd..5dae0ccd482b 100644 --- a/lotuswordpro/inc/xfilter/xfdrawlinestyle.hxx +++ b/lotuswordpro/inc/xfilter/xfdrawlinestyle.hxx @@ -121,13 +121,13 @@ public: /** * @descr decide whether it's a solid line. */ - bool IsSolid(); + bool IsSolid() const; - double GetWidth(); + double GetWidth() const; const XFColor& GetColor() const; - sal_Int32 GetTransparency(); + sal_Int32 GetTransparency() const; virtual enumXFStyle GetStyleFamily() override; @@ -190,12 +190,12 @@ inline void XFDrawLineStyle::SetSpace(double space) m_fSpace = space; } -inline bool XFDrawLineStyle::IsSolid() +inline bool XFDrawLineStyle::IsSolid() const { return (m_eLineStyle==enumXFLineSolid); } -inline double XFDrawLineStyle::GetWidth() +inline double XFDrawLineStyle::GetWidth() const { return m_fWidth; } @@ -205,7 +205,7 @@ inline const XFColor& XFDrawLineStyle::GetColor() const return m_aColor; } -inline sal_Int32 XFDrawLineStyle::GetTransparency() +inline sal_Int32 XFDrawLineStyle::GetTransparency() const { return m_nTransparency; } diff --git a/lotuswordpro/inc/xfilter/xffont.hxx b/lotuswordpro/inc/xfilter/xffont.hxx index f9e83eba1eb1..47067b3a59d2 100644 --- a/lotuswordpro/inc/xfilter/xffont.hxx +++ b/lotuswordpro/inc/xfilter/xffont.hxx @@ -213,10 +213,10 @@ public: void SetBackColorTransparent(); //getter: - enumXFTransform GetTransform(); + enumXFTransform GetTransform() const; - sal_Int16 GetFontSize(); - const XFColor& GetColor(); + sal_Int16 GetFontSize() const; + const XFColor& GetColor() const; void ToXml(IXFStream *pStrm); @@ -397,17 +397,17 @@ inline void XFFont::SetBackColorTransparent() m_nFlag |= XFFONT_FLAG_BGCOLOR; } -inline enumXFTransform XFFont::GetTransform() +inline enumXFTransform XFFont::GetTransform() const { return m_eTransform; } -inline sal_Int16 XFFont::GetFontSize() +inline sal_Int16 XFFont::GetFontSize() const { return m_nFontSize; } -inline const XFColor& XFFont::GetColor() +inline const XFColor& XFFont::GetColor() const { return m_aColor; } diff --git a/lotuswordpro/inc/xfilter/xffontdecl.hxx b/lotuswordpro/inc/xfilter/xffontdecl.hxx index e1a1e615a7cf..2c3eeaad7164 100644 --- a/lotuswordpro/inc/xfilter/xffontdecl.hxx +++ b/lotuswordpro/inc/xfilter/xffontdecl.hxx @@ -77,12 +77,12 @@ public: /** * @descr Get font name. */ - const OUString& GetFontName() { return m_strFontName;} + const OUString& GetFontName() const { return m_strFontName;} /** * @descr Get font family. */ - const OUString& GetFontFamily() { return m_strFontFamily;} + const OUString& GetFontFamily() const { return m_strFontFamily;} private: OUString m_strFontName; diff --git a/lotuswordpro/inc/xfilter/xfframe.hxx b/lotuswordpro/inc/xfilter/xfframe.hxx index 1394cde73ae0..35f73d32587a 100644 --- a/lotuswordpro/inc/xfilter/xfframe.hxx +++ b/lotuswordpro/inc/xfilter/xfframe.hxx @@ -154,7 +154,7 @@ public: /** * @descr Get the frame type. image, drawing or text-box. */ - enumXFFrameType GetFrameType(); + enumXFFrameType GetFrameType() const; /** * @descr Get content type, enumXFContentFrame. diff --git a/lotuswordpro/inc/xfilter/xfmargins.hxx b/lotuswordpro/inc/xfilter/xfmargins.hxx index 2705304d3004..0ee890c7f9d8 100644 --- a/lotuswordpro/inc/xfilter/xfmargins.hxx +++ b/lotuswordpro/inc/xfilter/xfmargins.hxx @@ -78,8 +78,8 @@ public: void SetTop(double top); void SetBottom(double bottom); - double GetLeft(); - double GetTop(); + double GetLeft() const; + double GetTop() const; void ToXml(IXFStream *pStrm); @@ -117,12 +117,12 @@ inline void XFMargins::SetBottom(double bottom) m_nFlag |= XFMARGINS_FLAG_BOTTOM; } -inline double XFMargins::GetLeft() +inline double XFMargins::GetLeft() const { return m_fLeft; } -inline double XFMargins::GetTop() +inline double XFMargins::GetTop() const { return m_fTop; } diff --git a/lotuswordpro/inc/xfilter/xfnumberstyle.hxx b/lotuswordpro/inc/xfilter/xfnumberstyle.hxx index 79f442b5566d..cea69c1f9010 100644 --- a/lotuswordpro/inc/xfilter/xfnumberstyle.hxx +++ b/lotuswordpro/inc/xfilter/xfnumberstyle.hxx @@ -75,7 +75,7 @@ public: void SetGroup(); void SetColor(const XFColor& color); - const XFColor& GetColor() {return m_aColor;} + const XFColor& GetColor() const {return m_aColor;} void SetPrefix(const OUString& prefix); diff --git a/lotuswordpro/inc/xfilter/xfparagraph.hxx b/lotuswordpro/inc/xfilter/xfparagraph.hxx index 20ad256cc769..f096b9b1837b 100644 --- a/lotuswordpro/inc/xfilter/xfparagraph.hxx +++ b/lotuswordpro/inc/xfilter/xfparagraph.hxx @@ -79,7 +79,7 @@ public: virtual ~XFParagraph() override; public: - bool HasContents(); + bool HasContents() const; virtual enumXFContent GetContentType() override; diff --git a/lotuswordpro/inc/xfilter/xfparastyle.hxx b/lotuswordpro/inc/xfilter/xfparastyle.hxx index f50f28f62f1e..f43c4fd4dba7 100644 --- a/lotuswordpro/inc/xfilter/xfparastyle.hxx +++ b/lotuswordpro/inc/xfilter/xfparastyle.hxx @@ -108,7 +108,7 @@ public: */ void SetMasterPage(const OUString& master); - const OUString& GetMasterPage(); + const OUString& GetMasterPage() const; /** * @descr set the paragraph default font. @@ -120,7 +120,7 @@ public: /** * @descr get the font object. */ - const rtl::Reference<XFFont>& GetFont(){ return m_pFont; } + const rtl::Reference<XFFont>& GetFont() const { return m_pFont; } /** * @descr Set the indent of the paragraph. This is the indent for @@ -216,7 +216,7 @@ public: virtual void ToXml(IXFStream *strm) override; void SetNumberRight(bool bFlag){m_bNumberRight = bFlag;} - bool GetNumberRight(){return m_bNumberRight;} + bool GetNumberRight() const {return m_bNumberRight;} protected: OUString m_strMasterPage; @@ -276,7 +276,7 @@ inline void XFParaStyle::ClearTabStyles() m_aTabs.Reset(); } -inline const OUString& XFParaStyle::GetMasterPage() +inline const OUString& XFParaStyle::GetMasterPage() const { return m_strMasterPage; } diff --git a/lotuswordpro/inc/xfilter/xfrow.hxx b/lotuswordpro/inc/xfilter/xfrow.hxx index 1f2a1e430e03..d8269057bb82 100644 --- a/lotuswordpro/inc/xfilter/xfrow.hxx +++ b/lotuswordpro/inc/xfilter/xfrow.hxx @@ -82,7 +82,7 @@ public: void SetOwnerTable(XFTable *pTable); - sal_Int32 GetRow(); + sal_Int32 GetRow() const; sal_Int32 GetCellCount() const; @@ -116,7 +116,7 @@ inline void XFRow::SetOwnerTable(XFTable *pTable) m_pOwnerTable = pTable; } -inline sal_Int32 XFRow::GetRow() +inline sal_Int32 XFRow::GetRow() const { return m_nRow; } diff --git a/lotuswordpro/inc/xfilter/xfrowstyle.hxx b/lotuswordpro/inc/xfilter/xfrowstyle.hxx index 41fc1c2adc76..8ca8d1223e03 100644 --- a/lotuswordpro/inc/xfilter/xfrowstyle.hxx +++ b/lotuswordpro/inc/xfilter/xfrowstyle.hxx @@ -73,7 +73,7 @@ public: public: void SetRowHeight(double height); - double GetRowHeight(); + double GetRowHeight() const; void SetMinRowHeight(double height); @@ -97,7 +97,7 @@ inline void XFRowStyle::SetMinRowHeight(double height) m_fMinHeight = height; } -inline double XFRowStyle::GetRowHeight() +inline double XFRowStyle::GetRowHeight() const { if (m_fMinHeight > FLOAT_MIN) { diff --git a/lotuswordpro/inc/xfilter/xfshadow.hxx b/lotuswordpro/inc/xfilter/xfshadow.hxx index 114a5debae93..b1f770c38b12 100644 --- a/lotuswordpro/inc/xfilter/xfshadow.hxx +++ b/lotuswordpro/inc/xfilter/xfshadow.hxx @@ -81,7 +81,7 @@ public: /** * @descr return shadow position. */ - enumXFShadowPos GetPosition(); + enumXFShadowPos GetPosition() const; /** * @descr Set shadow offset from owner object. @@ -91,7 +91,7 @@ public: /** * @descr return shadow offset. */ - double GetOffset(); + double GetOffset() const; /** * @descr Set shadow color. @@ -101,7 +101,7 @@ public: /** * @descr return shadow color. */ - const XFColor& GetColor(); + const XFColor& GetColor() const; OUString ToString(); @@ -120,7 +120,7 @@ inline void XFShadow::SetPosition(enumXFShadowPos pos) m_ePosition = pos; } -inline enumXFShadowPos XFShadow::GetPosition() +inline enumXFShadowPos XFShadow::GetPosition() const { return m_ePosition; } @@ -130,7 +130,7 @@ inline void XFShadow::SetOffset(double offset) m_fOffset = offset; } -inline double XFShadow::GetOffset() +inline double XFShadow::GetOffset() const { return m_fOffset; } @@ -140,7 +140,7 @@ inline void XFShadow::SetColor(const XFColor& color) m_aColor = color; } -inline const XFColor& XFShadow::GetColor() +inline const XFColor& XFShadow::GetColor() const { return m_aColor; } diff --git a/lotuswordpro/inc/xfilter/xftable.hxx b/lotuswordpro/inc/xfilter/xftable.hxx index 2ba1199f47ec..f36a1f295be6 100644 --- a/lotuswordpro/inc/xfilter/xftable.hxx +++ b/lotuswordpro/inc/xfilter/xftable.hxx @@ -94,7 +94,7 @@ public: sal_Int32 GetColumnCount(); - bool IsSubTable(); + bool IsSubTable() const; enumXFContent GetContentType() override; @@ -128,7 +128,7 @@ inline void XFTable::SetOwnerCell(XFCell *pCell) m_bSubTable = (pCell!=nullptr); } -inline bool XFTable::IsSubTable() +inline bool XFTable::IsSubTable() const { return m_bSubTable; } diff --git a/lotuswordpro/inc/xfilter/xftextstyle.hxx b/lotuswordpro/inc/xfilter/xftextstyle.hxx index 6b7711e5066e..50d73fe7ad3f 100644 --- a/lotuswordpro/inc/xfilter/xftextstyle.hxx +++ b/lotuswordpro/inc/xfilter/xftextstyle.hxx @@ -89,7 +89,7 @@ public: */ void SetFont(rtl::Reference<XFFont> const & font); - const rtl::Reference<XFFont>& GetFont(){ return m_pFont; } + const rtl::Reference<XFFont>& GetFont() const { return m_pFont; } virtual enumXFStyle GetStyleFamily() override; diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx index 65b98674e1cd..9f9447f4d7c1 100644 --- a/lotuswordpro/source/filter/bento.hxx +++ b/lotuswordpro/source/filter/bento.hxx @@ -145,7 +145,7 @@ public: // Internal methods CBenIDListElmt(BenObjectID ID, CUtListElmt * pPrev) : CUtListElmt(pPrev) { cID = ID; } explicit CBenIDListElmt(BenObjectID ID) { cID = ID; } - BenObjectID GetID() { return cID; } + BenObjectID GetID() const { return cID; } private: // Data BenObjectID cID; @@ -177,7 +177,7 @@ public: public: // Overridden methods /* added by */ - sal_uLong GetSize() { return m_ulValueLength; }; + sal_uLong GetSize() const { return m_ulValueLength; }; protected: // Overridden methods virtual std::size_t GetData(void* pData, std::size_t nSize) override; @@ -316,9 +316,9 @@ public: // Internal methods unsigned short Size) : CUtListElmt(&pValue->GetValueSegments()) { cImmediate = true; std::memcpy(cImmData, pImmData, Size); cSize = Size; } - bool IsImmediate() { return cImmediate; } - BenContainerPos GetPosition() { return cPos; } - size_t GetSize() { return cSize; } + bool IsImmediate() const { return cImmediate; } + BenContainerPos GetPosition() const { return cPos; } + size_t GetSize() const { return cSize; } BenByte * GetImmediateData() { return cImmData; } private: // Data @@ -346,7 +346,7 @@ public: // Internal methods CUtListElmt * pPrevObject, const OString& rName, CUtListElmt * pPrevNamedObjectListElmt); - const OString& GetName() { return csName; } + const OString& GetName() const { return csName; } private: // Data OString csName; diff --git a/lotuswordpro/source/filter/lwpbackgroundoverride.hxx b/lotuswordpro/source/filter/lwpbackgroundoverride.hxx index 757209880476..050496e87c60 100644 --- a/lotuswordpro/source/filter/lwpbackgroundoverride.hxx +++ b/lotuswordpro/source/filter/lwpbackgroundoverride.hxx @@ -81,7 +81,7 @@ public: pStrm->SkipExtra(); } - const LwpColor& GetBackColor(){ return m_aStuff.m_aFillColor; } + const LwpColor& GetBackColor() const { return m_aStuff.m_aFillColor; } LwpBackgroundStuff& GetBGStuff() { return m_aStuff; } protected: diff --git a/lotuswordpro/source/filter/lwpbackgroundstuff.hxx b/lotuswordpro/source/filter/lwpbackgroundstuff.hxx index e5bd1ad94b7b..6ace02784a52 100644 --- a/lotuswordpro/source/filter/lwpbackgroundstuff.hxx +++ b/lotuswordpro/source/filter/lwpbackgroundstuff.hxx @@ -152,8 +152,8 @@ public: LwpColor* GetFillColor(); std::unique_ptr<XFBGImage> GetFillPattern(); - bool IsTransparent() { return (m_nID == BACK_TRANSPARENT); } - bool IsPatternFill() { return (m_nID > 2 && m_nID < 72); } + bool IsTransparent() const { return (m_nID == BACK_TRANSPARENT); } + bool IsPatternFill() const { return (m_nID > 2 && m_nID < 72); } friend class LwpBackgroundOverride; private: diff --git a/lotuswordpro/source/filter/lwpborderstuff.hxx b/lotuswordpro/source/filter/lwpborderstuff.hxx index f9c77a292239..4a7da6ce208b 100644 --- a/lotuswordpro/source/filter/lwpborderstuff.hxx +++ b/lotuswordpro/source/filter/lwpborderstuff.hxx @@ -81,7 +81,7 @@ public: public: void Read(LwpObjectStream *pStrm); - sal_uInt16 GetSide(){ return m_nSides; } + sal_uInt16 GetSide() const { return m_nSides; } bool HasSide(sal_uInt16 side); sal_uInt16 GetSideType(sal_uInt16 side); LwpColor GetSideColor(sal_uInt16 side); diff --git a/lotuswordpro/source/filter/lwpbreaksoverride.hxx b/lotuswordpro/source/filter/lwpbreaksoverride.hxx index ba1f57e2a47c..70bc624d304a 100644 --- a/lotuswordpro/source/filter/lwpbreaksoverride.hxx +++ b/lotuswordpro/source/filter/lwpbreaksoverride.hxx @@ -91,23 +91,23 @@ public: void Override(LwpBreaksOverride* pOther); - inline bool IsPageBreakBefore(); - inline bool IsPageBreakAfter(); - inline bool IsPageBreakWithin(); - inline bool IsColumnBreakBefore(); - inline bool IsColumnBreakAfter(); - inline bool IsKeepWithNext(); - inline bool IsKeepWithPrevious(); - inline bool IsUseNextStyle(); - - inline bool IsPageBreakBeforeOverridden(); - inline bool IsPageBreakAfterOverridden(); - inline bool IsPageBreakWithinOverridden(); - inline bool IsColumnBreakBeforeOverridden(); - inline bool IsColumnBreakAfterOverridden(); - inline bool IsKeepWithNextOverridden(); - inline bool IsKeepWithPreviousOverridden(); - inline bool IsUseNextStyleOverridden(); + inline bool IsPageBreakBefore() const; + inline bool IsPageBreakAfter() const; + inline bool IsPageBreakWithin() const; + inline bool IsColumnBreakBefore() const; + inline bool IsColumnBreakAfter() const; + inline bool IsKeepWithNext() const; + inline bool IsKeepWithPrevious() const; + inline bool IsUseNextStyle() const; + + inline bool IsPageBreakBeforeOverridden() const; + inline bool IsPageBreakAfterOverridden() const; + inline bool IsPageBreakWithinOverridden() const; + inline bool IsColumnBreakBeforeOverridden() const; + inline bool IsColumnBreakAfterOverridden() const; + inline bool IsKeepWithNextOverridden() const; + inline bool IsKeepWithPreviousOverridden() const; + inline bool IsUseNextStyleOverridden() const; inline void RevertPageBreakBefore(); inline void RevertPageBreakAfter(); @@ -134,69 +134,69 @@ private: std::unique_ptr<LwpAtomHolder> m_pNextStyle; }; -inline bool LwpBreaksOverride::IsPageBreakBefore() +inline bool LwpBreaksOverride::IsPageBreakBefore() const { return ((m_nValues & BO_PAGEBEFORE) != 0); } -inline bool LwpBreaksOverride::IsPageBreakAfter() +inline bool LwpBreaksOverride::IsPageBreakAfter() const { return ((m_nValues & BO_PAGEAFTER) != 0); } -inline bool LwpBreaksOverride::IsPageBreakWithin() +inline bool LwpBreaksOverride::IsPageBreakWithin() const { return ((m_nValues & BO_KEEPTOGETHER) != 0); } -inline bool LwpBreaksOverride::IsColumnBreakBefore() +inline bool LwpBreaksOverride::IsColumnBreakBefore() const { return ((m_nValues & BO_COLBEFORE) != 0); } -inline bool LwpBreaksOverride::IsColumnBreakAfter() +inline bool LwpBreaksOverride::IsColumnBreakAfter() const { return ((m_nValues & BO_COLAFTER) != 0); } -inline bool LwpBreaksOverride::IsKeepWithNext() +inline bool LwpBreaksOverride::IsKeepWithNext() const { return ((m_nValues & BO_KEEPNEXT) != 0); } -inline bool LwpBreaksOverride::IsKeepWithPrevious() +inline bool LwpBreaksOverride::IsKeepWithPrevious() const { return ((m_nValues & BO_KEEPPREV) != 0); } -inline bool LwpBreaksOverride::IsUseNextStyle() +inline bool LwpBreaksOverride::IsUseNextStyle() const { return ((m_nValues & BO_USENEXTSTYLE) != 0); } -inline bool LwpBreaksOverride::IsPageBreakBeforeOverridden() +inline bool LwpBreaksOverride::IsPageBreakBeforeOverridden() const { return ((m_nOverride& BO_PAGEBEFORE) != 0); } -inline bool LwpBreaksOverride::IsPageBreakAfterOverridden() +inline bool LwpBreaksOverride::IsPageBreakAfterOverridden() const { return ((m_nOverride& BO_PAGEAFTER) != 0); } -inline bool LwpBreaksOverride::IsPageBreakWithinOverridden() +inline bool LwpBreaksOverride::IsPageBreakWithinOverridden() const { return ((m_nOverride& BO_KEEPTOGETHER) != 0); } -inline bool LwpBreaksOverride::IsColumnBreakBeforeOverridden() +inline bool LwpBreaksOverride::IsColumnBreakBeforeOverridden() const { return ((m_nOverride& BO_COLBEFORE) != 0); } -inline bool LwpBreaksOverride::IsColumnBreakAfterOverridden() +inline bool LwpBreaksOverride::IsColumnBreakAfterOverridden() const { return ((m_nOverride& BO_COLAFTER) != 0); } -inline bool LwpBreaksOverride::IsKeepWithNextOverridden() +inline bool LwpBreaksOverride::IsKeepWithNextOverridden() const { return ((m_nOverride& BO_KEEPNEXT) != 0); } -inline bool LwpBreaksOverride::IsKeepWithPreviousOverridden() +inline bool LwpBreaksOverride::IsKeepWithPreviousOverridden() const { return ((m_nOverride& BO_KEEPPREV) != 0); } -inline bool LwpBreaksOverride::IsUseNextStyleOverridden() +inline bool LwpBreaksOverride::IsUseNextStyleOverridden() const { return ((m_nOverride& BO_USENEXTSTYLE) != 0); } diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx index 35a8e3475030..c2cb1af53d8e 100644 --- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx +++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx @@ -93,7 +93,7 @@ LwpBulletStyleMgr::~LwpBulletStyleMgr() * @param pBullOver pointer to the bulletoverride of current paragraph. * @param pIndent pointer to the indentoverride of current paragraph. */ -OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOverride* pBullOver, +OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, const LwpBulletOverride* pBullOver, LwpIndentOverride const * pIndent) { if(!pPara || !pIndent || !pBullOver) diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx index 78754a75b355..c566e60caacb 100644 --- a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx +++ b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx @@ -80,7 +80,7 @@ class LwpBulletStyleMgr final public: LwpBulletStyleMgr(); ~LwpBulletStyleMgr(); - OUString RegisterBulletStyle(LwpPara* pPara, LwpBulletOverride* pBullOver, + OUString RegisterBulletStyle(LwpPara* pPara, const LwpBulletOverride* pBullOver, LwpIndentOverride const * pIndent); inline void SetFoundry(LwpFoundry* pFoundry); inline void SetContinueFlag(bool bFlag); diff --git a/lotuswordpro/source/filter/lwpcelllayout.hxx b/lotuswordpro/source/filter/lwpcelllayout.hxx index 5c54b92a1ffc..c558548fec91 100644 --- a/lotuswordpro/source/filter/lwpcelllayout.hxx +++ b/lotuswordpro/source/filter/lwpcelllayout.hxx @@ -98,8 +98,8 @@ public: m_bConvertCell = false; return aRet; } - sal_uInt16 GetRowID(){return crowid;} - sal_uInt8 GetColID(){return ccolid;} + sal_uInt16 GetRowID() const {return crowid;} + sal_uInt8 GetColID() const {return ccolid;} void RegisterStyle() override; LwpObjectID& GetNumericsObject() {return cLayNumerics;} LwpObjectID * GetPreviousCellStory(); @@ -107,7 +107,7 @@ public: LwpTableLayout * GetTableLayout(); virtual void SetCellMap(); double GetActualWidth(); - const OUString& GetNumfmtName(){return m_NumfmtName;} + const OUString& GetNumfmtName() const {return m_NumfmtName;} protected: void Read() override; LwpTable * GetTable(); @@ -176,8 +176,8 @@ public: virtual ~LwpConnectedCellLayout() override; virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_CONNECTED_CELL_LAYOUT;} virtual void Parse(IXFStream* pOutputStream) override; - sal_uInt16 GetNumrows(){return m_nRealrowspan;} - sal_uInt8 GetNumcols(){return m_nRealcolspan;} + sal_uInt16 GetNumrows() const {return m_nRealrowspan;} + sal_uInt8 GetNumcols() const {return m_nRealcolspan;} virtual void SetCellMap() override; void SetNumrows(sal_uInt16 nVal){m_nRealrowspan = nVal;} protected: diff --git a/lotuswordpro/source/filter/lwpcontent.hxx b/lotuswordpro/source/filter/lwpcontent.hxx index c29bb6e99029..6bee0d1af19d 100644 --- a/lotuswordpro/source/filter/lwpcontent.hxx +++ b/lotuswordpro/source/filter/lwpcontent.hxx @@ -106,9 +106,9 @@ protected: public: inline LwpAssociatedLayouts& GetLayoutsWithMe(); rtl::Reference<LwpVirtualLayout> GetLayout(LwpVirtualLayout const * pStartLayout); - inline bool IsActive(); + inline bool IsActive() const; virtual bool IsTable(); - inline OUString const & GetClassName(); + inline OUString const & GetClassName() const; inline LwpContent* GetNextEnumerated(); bool HasNonEmbeddedLayouts(); bool IsStyleContent(); @@ -119,7 +119,7 @@ LwpAssociatedLayouts& LwpContent::GetLayoutsWithMe() return m_LayoutsWithMe; } -inline bool LwpContent::IsActive() +inline bool LwpContent::IsActive() const { return !(m_nFlags & CF_DEACTIVATED); } @@ -129,7 +129,7 @@ inline bool LwpContent::IsTable() return false; } -inline OUString const & LwpContent::GetClassName() +inline OUString const & LwpContent::GetClassName() const { return m_ClassName.str(); } diff --git a/lotuswordpro/source/filter/lwpdivinfo.cxx b/lotuswordpro/source/filter/lwpdivinfo.cxx index bd4da5b6070c..ea58b2d9c516 100644 --- a/lotuswordpro/source/filter/lwpdivinfo.cxx +++ b/lotuswordpro/source/filter/lwpdivinfo.cxx @@ -154,7 +154,7 @@ void LwpDivInfo::GetNumberOfPages(sal_uInt16 & nPageno) } } -sal_uInt16 LwpDivInfo::GetMaxNumberOfPages() +sal_uInt16 LwpDivInfo::GetMaxNumberOfPages() const { LwpDocument* pDiv = dynamic_cast<LwpDocument*>(m_ParentID.obj().get()); if(!pDiv) diff --git a/lotuswordpro/source/filter/lwpdivinfo.hxx b/lotuswordpro/source/filter/lwpdivinfo.hxx index 86096f33afd3..c04271799d64 100644 --- a/lotuswordpro/source/filter/lwpdivinfo.hxx +++ b/lotuswordpro/source/filter/lwpdivinfo.hxx @@ -76,15 +76,15 @@ public: LwpDivInfo(LwpObjectHeader const & objHdr, LwpSvStream* pStrm); LwpObjectID& GetInitialLayoutID() { return m_InitialLayoutID; } LwpObjectID& GetFillerPageTextID() { return m_FillerPageTextID; } - OUString const & GetDivName() { return m_Name.str(); } + OUString const & GetDivName() const { return m_Name.str(); } - OUString const & GetClassName() { return m_ClassName.str(); } - inline bool HasContents(); - inline bool IsOleDivision(); - inline bool IsScrollable(); - inline bool IsGotoable(); + OUString const & GetClassName() const { return m_ClassName.str(); } + inline bool HasContents() const; + inline bool IsOleDivision() const; + inline bool IsScrollable() const; + inline bool IsGotoable() const; void GetNumberOfPages(sal_uInt16& nPageno); - sal_uInt16 GetMaxNumberOfPages(); + sal_uInt16 GetMaxNumberOfPages() const; protected: void Read() override; private: @@ -129,12 +129,12 @@ private: }; -inline bool LwpDivInfo::HasContents() +inline bool LwpDivInfo::HasContents() const { return (m_nFlags & DI_HASCONTENTS) != 0; } -inline bool LwpDivInfo::IsOleDivision() +inline bool LwpDivInfo::IsOleDivision() const { OUString strClassName = GetClassName(); if (strClassName == STR_OleDivisionClassName) @@ -142,12 +142,12 @@ inline bool LwpDivInfo::IsOleDivision() return false; } -inline bool LwpDivInfo::IsScrollable() +inline bool LwpDivInfo::IsScrollable() const { return (m_nFlags & DI_SCROLLABLE) != 0; } -inline bool LwpDivInfo::IsGotoable() +inline bool LwpDivInfo::IsGotoable() const { return HasContents() && (IsScrollable() || IsOleDivision()); } diff --git a/lotuswordpro/source/filter/lwpdoc.hxx b/lotuswordpro/source/filter/lwpdoc.hxx index 198dfdc28290..b6385518dee4 100644 --- a/lotuswordpro/source/filter/lwpdoc.hxx +++ b/lotuswordpro/source/filter/lwpdoc.hxx @@ -128,8 +128,8 @@ public: void Parse(IXFStream* pOutputStream) override; void RegisterStyle() override; - inline bool IsChildDoc(); - inline bool GetHonorProtection(); + inline bool IsChildDoc() const; + inline bool GetHonorProtection() const; inline LwpObjectID& GetDocData(); inline LwpObjectID& GetSocket(); @@ -177,11 +177,11 @@ private: bool IsSkippedDivision(); }; -inline bool LwpDocument::IsChildDoc() +inline bool LwpDocument::IsChildDoc() const { return (m_nPersistentFlags & DOC_CHILDDOC) != 0; } -inline bool LwpDocument::GetHonorProtection() +inline bool LwpDocument::GetHonorProtection() const { return (m_nPersistentFlags & DOC_PROTECTED) != 0; } diff --git a/lotuswordpro/source/filter/lwpfont.cxx b/lotuswordpro/source/filter/lwpfont.cxx index 92c8a853c28c..7015bfb7a573 100644 --- a/lotuswordpro/source/filter/lwpfont.cxx +++ b/lotuswordpro/source/filter/lwpfont.cxx @@ -176,39 +176,39 @@ bool LwpFontAttrEntry::Is(sal_uInt16 Attr) return (0 != (m_nAttrBits & Attr)); } -bool LwpFontAttrEntry::IsBoldOverridden() +bool LwpFontAttrEntry::IsBoldOverridden() const { return (0 != (m_nAttrOverrideBits & BOLD)); } -bool LwpFontAttrEntry::IsItalicOverridden() +bool LwpFontAttrEntry::IsItalicOverridden() const { return (0 != (m_nAttrOverrideBits & ITALIC)); } -bool LwpFontAttrEntry::IsStrikeThruOverridden() +bool LwpFontAttrEntry::IsStrikeThruOverridden() const { return (0 != (m_nAttrOverrideBits & STRIKETHRU)); } -bool LwpFontAttrEntry::IsSmallCapsOverridden() +bool LwpFontAttrEntry::IsSmallCapsOverridden() const { return (0 != (m_nAttrOverrideBits & SMALLCAPS)); } -bool LwpFontAttrEntry::IsSuperOverridden() +bool LwpFontAttrEntry::IsSuperOverridden() const { return (0 != (m_nAttrOverrideBits & SUPERSCRIPT)); } -bool LwpFontAttrEntry::IsSubOverridden() +bool LwpFontAttrEntry::IsSubOverridden() const { return (0 != (m_nAttrOverrideBits & SUBSCRIPT)); } -bool LwpFontAttrEntry::IsUnderlineOverridden() +bool LwpFontAttrEntry::IsUnderlineOverridden() const { return (0 != (m_nAttrOverrideBits2 & UNDER)); } -bool LwpFontAttrEntry::IsCaseOverridden() +bool LwpFontAttrEntry::IsCaseOverridden() const { return (0 != (m_nAttrOverrideBits2 & CASE)); } @@ -230,7 +230,7 @@ void LwpFontTableEntry::Read(LwpObjectStream *pStrm) RegisterFontDecl(); } -OUString const & LwpFontTableEntry::GetFaceName() +OUString const & LwpFontTableEntry::GetFaceName() const { return m_WindowsFaceName.str(); } @@ -319,27 +319,27 @@ void LwpFontNameEntry::Override(rtl::Reference<XFFont> const & pFont) // pFont->SetTightness(cTightness); } -bool LwpFontNameEntry::IsFaceNameOverridden() +bool LwpFontNameEntry::IsFaceNameOverridden() const { return (0 != (m_nOverrideBits & FACENAME)); } -bool LwpFontNameEntry::IsAltFaceNameOverridden() +bool LwpFontNameEntry::IsAltFaceNameOverridden() const { return (0 != (m_nOverrideBits & ALTFACENAME)); } -bool LwpFontNameEntry::IsPointSizeOverridden() +bool LwpFontNameEntry::IsPointSizeOverridden() const { return (0 != (m_nOverrideBits & POINTSIZE)); } -bool LwpFontNameEntry::IsColorOverridden() +bool LwpFontNameEntry::IsColorOverridden() const { return (0 != (m_nOverrideBits & COLOR)); } -bool LwpFontNameEntry::IsBackgroundColorOverridden() +bool LwpFontNameEntry::IsBackgroundColorOverridden() const { return (0 != (m_nOverrideBits & BKCOLOR)); } diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx b/lotuswordpro/source/filter/lwpfootnote.cxx index 725d6e6809af..7ae711e30b1e 100644 --- a/lotuswordpro/source/filter/lwpfootnote.cxx +++ b/lotuswordpro/source/filter/lwpfootnote.cxx @@ -317,7 +317,7 @@ LwpDocument* LwpFootnote::GetEndnoteDivision(LwpDocument* pPossible) /** * @descr Get footnote table class name */ -OUString LwpFootnote::GetTableClass() +OUString LwpFootnote::GetTableClass() const { OUString strClassName; switch (GetType() & FN_MASK_BASE) @@ -528,7 +528,7 @@ void LwpFootnoteOptions::RegisterEndnoteStyle() /** * @descr Get continue on message */ -OUString LwpFootnoteOptions::GetContinuedOnMessage() +OUString LwpFootnoteOptions::GetContinuedOnMessage() const { if(m_ContinuedOnMessage.HasValue()) { @@ -541,7 +541,7 @@ OUString LwpFootnoteOptions::GetContinuedOnMessage() /** * @descr Get continue from message */ -OUString LwpFootnoteOptions::GetContinuedFromMessage() +OUString LwpFootnoteOptions::GetContinuedFromMessage() const { if(m_ContinuedFromMessage.HasValue()) { diff --git a/lotuswordpro/source/filter/lwpfootnote.hxx b/lotuswordpro/source/filter/lwpfootnote.hxx index b2073e0c0b11..5163204e39ea 100644 --- a/lotuswordpro/source/filter/lwpfootnote.hxx +++ b/lotuswordpro/source/filter/lwpfootnote.hxx @@ -134,14 +134,14 @@ private: sal_uInt16 m_nRow; LwpObjectID m_Content; public: - sal_uInt16 GetType(){ return m_nType;} + sal_uInt16 GetType() const { return m_nType;} private: LwpCellLayout* GetCellLayout(); LwpDocument* GetFootnoteTableDivision(); LwpDocument* GetEndnoteDivision(LwpDocument* pPossible); LwpEnSuperTableLayout* FindFootnoteTableLayout(); LwpContent* FindFootnoteContent(); - OUString GetTableClass(); + OUString GetTableClass() const; }; /** @@ -184,10 +184,10 @@ public: SUPERSCRIPT_REFERENCE = 0x10 }; public: - sal_uInt16 GetStartingNumber(){ return m_nStartingNumber;} - OUString const & GetLeadingText(){ return m_LeadingText.str();} - OUString const & GetTrailingText(){ return m_TrailingText.str();} - sal_uInt16 GetReset(){ return static_cast<sal_uInt16>(m_nFlag & RESET_MASK);} + sal_uInt16 GetStartingNumber() const { return m_nStartingNumber;} + OUString const & GetLeadingText() const { return m_LeadingText.str();} + OUString const & GetTrailingText() const { return m_TrailingText.str();} + sal_uInt16 GetReset() const { return static_cast<sal_uInt16>(m_nFlag & RESET_MASK);} }; /** @@ -218,12 +218,12 @@ public: HAS_SEPARATOR = 0x01, CUSTOM_LENGTH = 0x02 }; - sal_uInt32 GetLength(){ return m_nLength;} - sal_uInt32 GetIndent(){ return m_nIndent;} - sal_uInt32 GetAbove(){ return m_nAbove;} - sal_uInt32 GetBelow(){ return m_nBelow;} - bool HasCustomLength(){ return (m_nFlag & CUSTOM_LENGTH) != 0;} - bool HasSeparator(){ return (m_nFlag & HAS_SEPARATOR) != 0;} + sal_uInt32 GetLength() const { return m_nLength;} + sal_uInt32 GetIndent() const { return m_nIndent;} + sal_uInt32 GetAbove() const { return m_nAbove;} + sal_uInt32 GetBelow() const { return m_nBelow;} + bool HasCustomLength() const { return (m_nFlag & CUSTOM_LENGTH) != 0;} + bool HasSeparator() const { return (m_nFlag & HAS_SEPARATOR) != 0;} float GetTopBorderWidth(){ return m_BorderStuff.GetSideWidth(LwpBorderStuff::TOP);} LwpColor GetTopBorderColor(){ return m_BorderStuff.GetSideColor(LwpBorderStuff::TOP);} }; @@ -267,10 +267,10 @@ private: public: LwpFootnoteSeparatorOptions& GetFootnoteSeparator(){ return m_FootnoteSeparator;} - bool GetContinuedFrom(){ return ((m_nFlag & FO_CONTINUEFROM) != 0);} - bool GetContinuedOn(){ return ((m_nFlag & FO_CONTINUEON) != 0);} - OUString GetContinuedOnMessage(); - OUString GetContinuedFromMessage(); + bool GetContinuedFrom() const { return ((m_nFlag & FO_CONTINUEFROM) != 0);} + bool GetContinuedOn() const { return ((m_nFlag & FO_CONTINUEON) != 0);} + OUString GetContinuedOnMessage() const; + OUString GetContinuedFromMessage() const; void SetMasterPage(const OUString& strMasterPage){ m_strMasterPage = strMasterPage;} }; diff --git a/lotuswordpro/source/filter/lwpframelayout.hxx b/lotuswordpro/source/filter/lwpframelayout.hxx index 342770a2ea5e..a243de61643c 100644 --- a/lotuswordpro/source/filter/lwpframelayout.hxx +++ b/lotuswordpro/source/filter/lwpframelayout.hxx @@ -189,7 +189,7 @@ public: virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_DROPCAP_LAYOUT;} virtual void Parse(IXFStream* pOutputStream) override; virtual void XFConvert(XFContentContainer* pCont) override; - sal_uInt16 GetLines(){return m_nLines;} + sal_uInt16 GetLines() const {return m_nLines;} void SetChars(sal_uInt32 nChars){ m_nChars += nChars;} sal_uInt32 GetChars() const {return m_nChars;} void RegisterStyle(LwpFoundry* pFoundry); diff --git a/lotuswordpro/source/filter/lwpfrib.cxx b/lotuswordpro/source/filter/lwpfrib.cxx index 04cd857a3de1..c5bd91ab0adf 100644 --- a/lotuswordpro/source/filter/lwpfrib.cxx +++ b/lotuswordpro/source/filter/lwpfrib.cxx @@ -406,7 +406,7 @@ void LwpFrib::ConvertChars(XFContentContainer* pXFPara,const OUString& text) } } -void LwpFrib::ConvertHyperLink(XFContentContainer* pXFPara,LwpHyperlinkMgr* pHyperlink,const OUString& text) +void LwpFrib::ConvertHyperLink(XFContentContainer* pXFPara, const LwpHyperlinkMgr* pHyperlink,const OUString& text) { XFHyperlink* pHyper = new XFHyperlink; pHyper->SetHRef(pHyperlink->GetHyperlink()); diff --git a/lotuswordpro/source/filter/lwpfribbreaks.hxx b/lotuswordpro/source/filter/lwpfribbreaks.hxx index 2c061041dcd8..24a93b6c6fc1 100644 --- a/lotuswordpro/source/filter/lwpfribbreaks.hxx +++ b/lotuswordpro/source/filter/lwpfribbreaks.hxx @@ -75,7 +75,7 @@ public: void RegisterBreakStyle(LwpPara* pPara); void ParseLayout(); LwpObjectID& GetLayout() { return m_Layout;} - bool IsLastFrib(){return m_bLastFrib;} + bool IsLastFrib() const {return m_bLastFrib;} private: LwpObjectID m_Layout; diff --git a/lotuswordpro/source/filter/lwpfribframe.cxx b/lotuswordpro/source/filter/lwpfribframe.cxx index 1eb167766a1d..8a94efb8cbda 100644 --- a/lotuswordpro/source/filter/lwpfribframe.cxx +++ b/lotuswordpro/source/filter/lwpfribframe.cxx @@ -74,7 +74,7 @@ void LwpFribFrame::Read(LwpObjectStream* pObjStrm, sal_uInt16 /*len*/) * @descr: Get the layout object which the frib points to * */ -rtl::Reference<LwpObject> LwpFribFrame::GetLayout() +rtl::Reference<LwpObject> LwpFribFrame::GetLayout() const { return m_objLayout.obj(); } diff --git a/lotuswordpro/source/filter/lwpfribframe.hxx b/lotuswordpro/source/filter/lwpfribframe.hxx index 6334af37a212..74dce5cf2f5e 100644 --- a/lotuswordpro/source/filter/lwpfribframe.hxx +++ b/lotuswordpro/source/filter/lwpfribframe.hxx @@ -71,7 +71,7 @@ class LwpFribFrame : public LwpFrib public: explicit LwpFribFrame( LwpPara* pPara) : LwpFrib(pPara){} void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override; - rtl::Reference<LwpObject> GetLayout(); + rtl::Reference<LwpObject> GetLayout() const; void RegisterStyle(LwpFoundry* pFoundry) override; void SetParaDropcap(LwpPara* pPara); void XFConvert(XFContentContainer* pCont); diff --git a/lotuswordpro/source/filter/lwpfribmark.cxx b/lotuswordpro/source/filter/lwpfribmark.cxx index 878b37d3d28e..74f95a956e3c 100644 --- a/lotuswordpro/source/filter/lwpfribmark.cxx +++ b/lotuswordpro/source/filter/lwpfribmark.cxx @@ -361,7 +361,7 @@ void LwpFribField::RegisterStyle(LwpFoundry* pFoundry) } } -void LwpFribField::RegisterTimeField(LwpFieldMark* pFieldMark) +void LwpFribField::RegisterTimeField(const LwpFieldMark* pFieldMark) { OUString sFormula = pFieldMark->GetFormula();//now bookmark maybe not all register to bookmarkmgr, if (sFormula == "TotalEditingTime")//so check field type now is not correct. @@ -1228,7 +1228,7 @@ void LwpFribField::ConvertDocFieldStart(XFContentContainer* pXFPara,LwpFieldMark } } -void LwpFribField::ConvertDocFieldEnd(XFContentContainer* pXFPara,LwpFieldMark* pFieldMark) +void LwpFribField::ConvertDocFieldEnd(XFContentContainer* pXFPara, const LwpFieldMark* pFieldMark) { XFContent* pContent = nullptr; switch(m_nDocPowerType) @@ -1315,7 +1315,7 @@ void LwpFribField::ConvertDateTimeStart(XFContentContainer* pXFPara,LwpFieldMark } -void LwpFribField::ConvertDateTimeEnd(XFContentContainer* pXFPara,LwpFieldMark* pFieldMark) +void LwpFribField::ConvertDateTimeEnd(XFContentContainer* pXFPara, const LwpFieldMark* pFieldMark) { XFContent* pContent = nullptr; switch(m_nDateTimeType) @@ -1372,7 +1372,7 @@ void LwpFribField::ConvertCrossRefStart(XFContentContainer* pXFPara,LwpFieldMark pXFPara->Add(pRef); } -void LwpFribField::ConvertCrossRefEnd(XFContentContainer* pXFPara,LwpFieldMark* pFieldMark) +void LwpFribField::ConvertCrossRefEnd(XFContentContainer* pXFPara, const LwpFieldMark* pFieldMark) { XFCrossRefEnd* pRef = new XFCrossRefEnd; if (pFieldMark->GetStyleFlag()) diff --git a/lotuswordpro/source/filter/lwpfribmark.hxx b/lotuswordpro/source/filter/lwpfribmark.hxx index de18460a6137..50b0bb501a91 100644 --- a/lotuswordpro/source/filter/lwpfribmark.hxx +++ b/lotuswordpro/source/filter/lwpfribmark.hxx @@ -87,8 +87,8 @@ class LwpFribBookMark : public LwpFrib public: explicit LwpFribBookMark( LwpPara* pPara ); void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override; - const LwpObjectID& GetMarkerID(){return m_objMarker;} - sal_uInt8 GetType(){return m_nType;} + const LwpObjectID& GetMarkerID() const {return m_objMarker;} + sal_uInt8 GetType() const {return m_nType;} enum{MARKER_START=1,MARKER_END,MARKER_NONE}; void XFConvert(XFContentContainer* pXFPara); void RegisterStyle(LwpFoundry* pFoundry) override; @@ -105,7 +105,7 @@ public: explicit LwpFribField( LwpPara* pPara ); void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override; LwpFieldMark* GetMarker(); - sal_uInt8 GetType(){return m_nType;} + sal_uInt8 GetType() const {return m_nType;} enum{MARKER_START=1,MARKER_END,MARKER_NONE}; void XFConvert(XFContentContainer* pXFPara); void RegisterStyle(LwpFoundry* pFoundry) override; @@ -127,15 +127,15 @@ private: sal_uInt8 m_nDateTimeType; sal_uInt8 m_nDocPowerType; - void RegisterTimeField(LwpFieldMark* pFieldMark); + void RegisterTimeField(const LwpFieldMark* pFieldMark); void RegisterDateTimeStyle(const OUString& sFormula); void RegisterTotalTimeStyle(); void CheckFieldType(LwpFieldMark* pFieldMark); void ConvertDocFieldStart(XFContentContainer* pXFPara,LwpFieldMark* pFieldMark); - void ConvertDocFieldEnd(XFContentContainer* pXFPara,LwpFieldMark* pFieldMark); + void ConvertDocFieldEnd(XFContentContainer* pXFPara, const LwpFieldMark* pFieldMark); void ConvertDateTimeStart(XFContentContainer* pXFPara,LwpFieldMark* pFieldMark); - void ConvertDateTimeEnd(XFContentContainer* pXFPara,LwpFieldMark* pFieldMark); - static void ConvertCrossRefEnd(XFContentContainer* pXFPara,LwpFieldMark* pFieldMark); + void ConvertDateTimeEnd(XFContentContainer* pXFPara, const LwpFieldMark* pFieldMark); + static void ConvertCrossRefEnd(XFContentContainer* pXFPara, const LwpFieldMark* pFieldMark); void ConvertCrossRefStart(XFContentContainer* pXFPara,LwpFieldMark* pFieldMark); }; diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx b/lotuswordpro/source/filter/lwpfribptr.cxx index 2a7566267ba6..f1d9917de8bf 100644 --- a/lotuswordpro/source/filter/lwpfribptr.cxx +++ b/lotuswordpro/source/filter/lwpfribptr.cxx @@ -534,7 +534,7 @@ void LwpFribPtr::RegisterStyle() } } -void LwpFribPtr::ProcessDropcap(LwpStory* pStory,LwpFrib* pFrib,sal_uInt32 nLen) +void LwpFribPtr::ProcessDropcap(LwpStory* pStory, const LwpFrib* pFrib,sal_uInt32 nLen) { if (pStory && pStory->GetDropcapFlag()) { diff --git a/lotuswordpro/source/filter/lwpfribptr.hxx b/lotuswordpro/source/filter/lwpfribptr.hxx index 58cb3fae2079..d59cb81ca0d4 100644 --- a/lotuswordpro/source/filter/lwpfribptr.hxx +++ b/lotuswordpro/source/filter/lwpfribptr.hxx @@ -77,7 +77,7 @@ private: LwpFrib* m_pFribs; XFParagraph* m_pXFPara;//Current XFPara used for frib parsing LwpPara* m_pPara;//for get foundry - static void ProcessDropcap(LwpStory* pStory,LwpFrib* pFrib,sal_uInt32 nLen); + static void ProcessDropcap(LwpStory* pStory, const LwpFrib* pFrib,sal_uInt32 nLen); public: void XFConvert(); void SetXFPara(XFParagraph* Para){m_pXFPara = Para;} diff --git a/lotuswordpro/source/filter/lwpfribtext.hxx b/lotuswordpro/source/filter/lwpfribtext.hxx index 1a7147c348b1..cc1c5b83c545 100644 --- a/lotuswordpro/source/filter/lwpfribtext.hxx +++ b/lotuswordpro/source/filter/lwpfribtext.hxx @@ -73,7 +73,7 @@ private: OUString m_Content; bool m_bNoUnicode; public: - const OUString& GetText(){return m_Content;} + const OUString& GetText() const {return m_Content;} }; class LwpFribHardSpace : public LwpFrib @@ -187,7 +187,7 @@ public: private: OUString m_Content; public: - const OUString& GetText(){return m_Content;} + const OUString& GetText() const {return m_Content;} }; class LwpFribPageNumber : public LwpFrib diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx index 1d21c9a3d4c8..29339e04857e 100644 --- a/lotuswordpro/source/filter/lwpgrfobj.cxx +++ b/lotuswordpro/source/filter/lwpgrfobj.cxx @@ -237,7 +237,7 @@ void LwpGraphicObject::XFConvert (XFContentContainer* pCont) * these formats by Word Pro. * @return sal_True if yes sal_False if not. */ -bool LwpGraphicObject::IsGrafFormatValid() +bool LwpGraphicObject::IsGrafFormatValid() const { return (m_sServerContextFormat[1]=='b'&& m_sServerContextFormat[2]=='m' && m_sServerContextFormat[3]=='p') || (m_sServerContextFormat[1]=='j' && m_sServerContextFormat[2]=='p' && m_sServerContextFormat[3]=='g') diff --git a/lotuswordpro/source/filter/lwpgrfobj.hxx b/lotuswordpro/source/filter/lwpgrfobj.hxx index 969e0c0f05d3..3332124f4ad5 100644 --- a/lotuswordpro/source/filter/lwpgrfobj.hxx +++ b/lotuswordpro/source/filter/lwpgrfobj.hxx @@ -107,7 +107,7 @@ private: void XFConvertEquation(XFContentContainer* pCont); - bool IsGrafFormatValid(); + bool IsGrafFormatValid() const; std::vector< rtl::Reference<XFFrame> > m_vXFDrawObjects; public: @@ -123,8 +123,8 @@ public: void GetGrafOrgSize(long& rWidth, long& rHeight) { rWidth = m_Cache.Width; rHeight = m_Cache.Height; } void GetGrafOrgSize(double& rWidth, double& rHeight) override; - sal_Int16 IsLinked(){ return m_bIsLinked;} - const OUString& GetLinkedFilePath(){ return m_LinkedFilePath;} + sal_Int16 IsLinked() const { return m_bIsLinked;} + const OUString& GetLinkedFilePath() const { return m_LinkedFilePath;} }; #endif diff --git a/lotuswordpro/source/filter/lwphyperlinkmgr.hxx b/lotuswordpro/source/filter/lwphyperlinkmgr.hxx index a0afad55240a..0ec5b16b3210 100644 --- a/lotuswordpro/source/filter/lwphyperlinkmgr.hxx +++ b/lotuswordpro/source/filter/lwphyperlinkmgr.hxx @@ -69,9 +69,9 @@ public: LwpHyperlinkMgr(); ~LwpHyperlinkMgr(); void SetHyperlinkFlag(bool bFlag){m_bIsHyperlink = bFlag;} - bool GetHyperlinkFlag(){return m_bIsHyperlink;} + bool GetHyperlinkFlag() const {return m_bIsHyperlink;} void SetHyperlink(const OUString& hyperlink); - const OUString& GetHyperlink() { return m_Hyperlink;} + const OUString& GetHyperlink() const { return m_Hyperlink;} private: OUString m_Hyperlink; bool m_bIsHyperlink; diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx index 82607a17cd05..d9b442268b04 100644 --- a/lotuswordpro/source/filter/lwplayout.cxx +++ b/lotuswordpro/source/filter/lwplayout.cxx @@ -211,7 +211,7 @@ bool LwpVirtualLayout::HasProtection() * @descr: Whether it is a mirror layout * */ -bool LwpVirtualLayout::IsComplex() +bool LwpVirtualLayout::IsComplex() const { return (m_nAttributes & STYLE_COMPLEX) != 0; } @@ -321,7 +321,7 @@ bool LwpVirtualLayout::IsRelativeAnchored() /** * @descr: whether it is MinimumHeight layout */ -bool LwpVirtualLayout::IsMinimumHeight() +bool LwpVirtualLayout::IsMinimumHeight() const { return ((m_nAttributes3& STYLE3_MINHEIGHTVALID) != 0); } @@ -430,7 +430,7 @@ bool LwpVirtualLayout::IsAutoGrowWidth() * @descr: Determine whether the layout width is to margin * */ -bool LwpVirtualLayout::IsInlineToMargin() +bool LwpVirtualLayout::IsInlineToMargin() const { return (m_nAttributes3 & STYLE3_INLINETOMARGIN) != 0; } @@ -631,7 +631,7 @@ void LwpMiddleLayout::Read() } } -rtl::Reference<LwpObject> LwpMiddleLayout::GetBasedOnStyle() +rtl::Reference<LwpObject> LwpMiddleLayout::GetBasedOnStyle() const { rtl::Reference<LwpObject> xRet(m_BasedOnStyle.obj()); if (xRet.get() == this) diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx index 5cb97064cbf3..c68a82d1edd3 100644 --- a/lotuswordpro/source/filter/lwplayout.hxx +++ b/lotuswordpro/source/filter/lwplayout.hxx @@ -106,7 +106,7 @@ public: virtual bool IsAutoGrowRight(){ return false;} bool IsFitGraphic(); bool IsAutoGrowWidth(); - bool IsInlineToMargin(); + bool IsInlineToMargin() const; virtual sal_uInt8 GetContentOrientation(){ return TEXT_ORIENT_LRTB;} bool GetHonorProtection() { @@ -171,8 +171,8 @@ public: m_bGettingExtMarginsValue = false; return fRet; } - const OUString& GetStyleName(){ return m_StyleName;} - bool IsComplex(); + const OUString& GetStyleName() const { return m_StyleName;} + bool IsComplex() const; virtual bool IsAnchorPage(){ return false;} virtual bool IsAnchorFrame(){ return false;} virtual bool IsAnchorCell(){ return false;} @@ -192,7 +192,7 @@ public: virtual bool IsUseOnAllOddPages(){ return false;} virtual bool IsUseOnPage(){ return false;} virtual sal_Int32 GetPageNumber(sal_uInt16 /*nLayoutNumber*/) { return -1;} - bool IsMinimumHeight(); + bool IsMinimumHeight() const; virtual bool IsForWaterMark(){ return false;} virtual LwpPara* GetLastParaOfPreviousStory() { return nullptr; } rtl::Reference<LwpVirtualLayout> GetParentLayout(); @@ -200,7 +200,7 @@ public: void RegisterChildStyle(); bool NoContentReference(); bool IsStyleLayout(); - enumXFAlignType GetVerticalAlignmentType() + enumXFAlignType GetVerticalAlignmentType() const { if (m_nAttributes & STYLE_CENTEREDVERTICALLY) { @@ -401,7 +401,7 @@ protected: }; LwpObjectID m_Content; - rtl::Reference<LwpObject> GetBasedOnStyle(); + rtl::Reference<LwpObject> GetBasedOnStyle() const; LwpObjectID m_TabPiece; LwpLayoutStyle m_aStyleStuff; LwpLayoutMisc m_aMiscStuff; @@ -482,7 +482,7 @@ public: * @descr: Get font style for setting position of frame * */ - const rtl::Reference<XFFont>& GetFont() { return m_pFont; } + const rtl::Reference<XFFont>& GetFont() const { return m_pFont; } void SetFont(rtl::Reference<XFFont> const & pFont); enum WrapType { diff --git a/lotuswordpro/source/filter/lwplaypiece.hxx b/lotuswordpro/source/filter/lwplaypiece.hxx index f19833e26c3a..d5319ffb299d 100644 --- a/lotuswordpro/source/filter/lwplaypiece.hxx +++ b/lotuswordpro/source/filter/lwplaypiece.hxx @@ -83,11 +83,11 @@ class LwpLayoutGeometry final : public LwpVirtualPiece public: LwpLayoutGeometry(LwpObjectHeader const & objHdr, LwpSvStream* pStrm); virtual void Parse(IXFStream* pOutputStream) override; - sal_Int32 GetWidth() { return m_nWidth; } - sal_Int32 GetHeight() { return m_nHeight; } - const LwpPoint& GetOrigin() { return m_Origin; } - const LwpPoint& GetAbsoluteOrigin() { return m_AbsoluteOrigin; } - sal_uInt8 GetContentOrientation(){ return m_ContentOrientation;} + sal_Int32 GetWidth() const { return m_nWidth; } + sal_Int32 GetHeight() const { return m_nHeight; } + const LwpPoint& GetOrigin() const { return m_Origin; } + const LwpPoint& GetAbsoluteOrigin() const { return m_AbsoluteOrigin; } + sal_uInt8 GetContentOrientation() const { return m_ContentOrientation;} private: virtual void Read() override; @@ -110,11 +110,11 @@ public: enum {CENTERED = 1, TILED = 2}; LwpLayoutScale(LwpObjectHeader const & objHdr, LwpSvStream* pStrm); virtual void Parse(IXFStream* pOutputStream) override; - sal_uInt16 GetScaleMode(){return m_nScaleMode;} - sal_uInt32 GetScalePercentage(){return m_nScalePercentage;} - sal_Int32 GetScaleWidth(){return m_nScaleWidth;} - sal_Int32 GetScaleHeight(){return m_nScaleHeight;} - sal_uInt16 GetPlacement(){return m_nPlacement;} + sal_uInt16 GetScaleMode() const {return m_nScaleMode;} + sal_uInt32 GetScalePercentage() const {return m_nScalePercentage;} + sal_Int32 GetScaleWidth() const {return m_nScaleWidth;} + sal_Int32 GetScaleHeight() const {return m_nScaleHeight;} + sal_uInt16 GetPlacement() const {return m_nPlacement;} LwpPoint& GetOffset() {return m_Offset;} private: virtual void Read() override; @@ -214,7 +214,7 @@ class LwpLayoutColumns final : public LwpVirtualPiece public: LwpLayoutColumns(LwpObjectHeader const & objHdr, LwpSvStream* pStrm); virtual void Parse(IXFStream* pOutputStream) override; - sal_uInt16 GetNumCols(){return m_nNumCols;} + sal_uInt16 GetNumCols() const {return m_nNumCols;} double GetColGap(sal_uInt16 nIndex); private: virtual void Read() override; @@ -313,7 +313,7 @@ class LwpLayoutRelativityGuts public: LwpLayoutRelativityGuts(); void Read(LwpObjectStream *pStrm); - sal_uInt8 GetRelativeType(){ return m_nRelType;} + sal_uInt8 GetRelativeType() const { return m_nRelType;} enum RelativeType { LAY_PARENT_RELATIVE = 1, diff --git a/lotuswordpro/source/filter/lwpmarker.cxx b/lotuswordpro/source/filter/lwpmarker.cxx index 553f2369a244..9f71b3e7bab7 100644 --- a/lotuswordpro/source/filter/lwpmarker.cxx +++ b/lotuswordpro/source/filter/lwpmarker.cxx @@ -140,7 +140,7 @@ void LwpCHBlkMarker::Read() } } -OUString LwpCHBlkMarker::GetPromptText() +OUString LwpCHBlkMarker::GetPromptText() const { LwpStory* pStory = nullptr; if (m_objPromptStory.obj().is()) @@ -286,12 +286,12 @@ void LwpCHBlkMarker::ProcessKeylist(XFContentContainer* pXFPara,sal_uInt8 nType) } } -bool LwpCHBlkMarker::IsHasFilled() +bool LwpCHBlkMarker::IsHasFilled() const { return (CHB_PROMPT & m_nFlag) == 0; } -bool LwpCHBlkMarker::IsBubbleHelp() +bool LwpCHBlkMarker::IsBubbleHelp() const { return (CHB_HELP & m_nFlag) != 0; } @@ -411,7 +411,7 @@ void LwpFieldMark::ParseTOC(OUString& sLevel,OUString& sText) sText.clear(); } -bool LwpFieldMark::IsFormulaInsert() +bool LwpFieldMark::IsFormulaInsert() const { return (m_nFlag & FF_FORMULAINSERTED) != 0; } diff --git a/lotuswordpro/source/filter/lwpmarker.hxx b/lotuswordpro/source/filter/lwpmarker.hxx index a2a03ca3634d..719b07ea4c50 100644 --- a/lotuswordpro/source/filter/lwpmarker.hxx +++ b/lotuswordpro/source/filter/lwpmarker.hxx @@ -113,7 +113,7 @@ class LwpCHBlkMarker : public LwpStoryMarker public: LwpCHBlkMarker(LwpObjectHeader const &objHdr, LwpSvStream *pStrm); void Read() override; - sal_uInt16 GetAction(){return m_nAction;} + sal_uInt16 GetAction() const {return m_nAction;} void ConvertCHBlock(XFContentContainer* pXFPara,sal_uInt8 nType); enum{ CLICKHERE_CHBEHAVIORTEXT=1, @@ -136,9 +136,9 @@ private: void ProcessPlaceHolder(XFContentContainer* pXFPara,sal_uInt16 nAction,sal_uInt8 nType); void ProcessOtherCHB(XFContentContainer* pXFPara,sal_uInt8 nType); void ProcessKeylist(XFContentContainer* pXFPara,sal_uInt8 nType); - bool IsHasFilled(); - bool IsBubbleHelp(); - OUString GetPromptText(); + bool IsHasFilled() const; + bool IsBubbleHelp() const; + OUString GetPromptText() const; void EnumAllKeywords(); private: enum{ @@ -189,19 +189,19 @@ public: void Read() override; void ParseIndex(OUString& sKey1,OUString& sKey2); void ParseTOC(OUString& sLevel,OUString& sText); - sal_uInt16 GetFieldType(){return m_nFieldType;} - bool IsFormulaInsert(); + sal_uInt16 GetFieldType() const {return m_nFieldType;} + bool IsFormulaInsert() const; bool IsDateTimeField(sal_uInt8& type,OUString& formula); bool IsCrossRefField(sal_uInt8& nType, OUString& sMarkName); bool IsDocPowerField(sal_uInt8& nType,OUString& sFormula); - OUString const & GetFormula(){return m_Formula.str();} + OUString const & GetFormula() const {return m_Formula.str();} void SetStyleFlag(bool bFalg){m_bHasStyle = bFalg;} - bool GetStyleFlag(){return m_bHasStyle;} - bool GetStart(){return m_bHasStart;} + bool GetStyleFlag() const {return m_bHasStyle;} + bool GetStart() const {return m_bHasStart;} void SetStart(bool bFlag){m_bHasStart = bFlag;} LwpFrib* GetStartFrib(){return m_pFrib;} void SetStartFrib(LwpFrib* pFrib){m_pFrib = pFrib;} - bool GetRevisionFlag(){return m_bRevisionFlag;} + bool GetRevisionFlag() const {return m_bRevisionFlag;} void SetRevisionFlag(bool bFlag){m_bRevisionFlag = bFlag;} enum{ @@ -250,11 +250,11 @@ class LwpRubyMarker : public LwpStoryMarker public: LwpRubyMarker(LwpObjectHeader const &objHdr, LwpSvStream *pStrm); void Read() override; - const OUString& GetRubyText(){return m_strRubyText;} + const OUString& GetRubyText() const {return m_strRubyText;} void SetRubyText(const OUString& sText){m_strRubyText = sText;} - const OUString& GetTextStyleName(){return m_TextStyle;} + const OUString& GetTextStyleName() const {return m_TextStyle;} void SetTextStyleName(const OUString& sName){m_TextStyle = sName;} - const OUString& GetRubyStyleName(){return m_RubyStyle;} + const OUString& GetRubyStyleName() const {return m_RubyStyle;} void SetRubyStyleName(const OUString& sName){m_RubyStyle = sName;} private: LwpObjectID m_objLayout; diff --git a/lotuswordpro/source/filter/lwpnotes.hxx b/lotuswordpro/source/filter/lwpnotes.hxx index 9abcce3897f6..df79d1b62fcc 100644 --- a/lotuswordpro/source/filter/lwpnotes.hxx +++ b/lotuswordpro/source/filter/lwpnotes.hxx @@ -91,7 +91,7 @@ public: virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_NOTE_LAYOUT;} virtual void RegisterStyle() override; virtual void XFConvert(XFContentContainer* pCont) override; - sal_uInt32 GetTime(){ return m_nTime;} + sal_uInt32 GetTime() const { return m_nTime;} OUString GetAuthor(); private: diff --git a/lotuswordpro/source/filter/lwpnumberingoverride.hxx b/lotuswordpro/source/filter/lwpnumberingoverride.hxx index 029bef6a70d0..b4851a103dec 100644 --- a/lotuswordpro/source/filter/lwpnumberingoverride.hxx +++ b/lotuswordpro/source/filter/lwpnumberingoverride.hxx @@ -82,7 +82,7 @@ public: inline sal_uInt16 GetLevel() const; inline sal_uInt16 GetPosition() const; - inline bool IsHeading(); + inline bool IsHeading() const; void OverrideLevel(sal_uInt16 nNewLv); @@ -104,7 +104,7 @@ inline sal_uInt16 LwpNumberingOverride::GetPosition() const return m_nPosition; } -inline bool LwpNumberingOverride::IsHeading() +inline bool LwpNumberingOverride::IsHeading() const { return (m_nValues & HEADING) != 0; } diff --git a/lotuswordpro/source/filter/lwpnumericfmt.cxx b/lotuswordpro/source/filter/lwpnumericfmt.cxx index e70ae6d04208..871dd56ab4f0 100644 --- a/lotuswordpro/source/filter/lwpnumericfmt.cxx +++ b/lotuswordpro/source/filter/lwpnumericfmt.cxx @@ -103,7 +103,7 @@ void LwpNumericFormatSubset::QuickRead(LwpObjectStream* pStrm) pStrm->SkipExtra(); } -LwpColor LwpNumericFormatSubset::GetColor() +LwpColor LwpNumericFormatSubset::GetColor() const { if (cSubFlags&0x04) { diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx b/lotuswordpro/source/filter/lwpnumericfmt.hxx index 65f7cba39833..bd21accecfe8 100644 --- a/lotuswordpro/source/filter/lwpnumericfmt.hxx +++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx @@ -76,11 +76,11 @@ class LwpNumericFormatSubset final public: LwpNumericFormatSubset(); void QuickRead(LwpObjectStream* pStrm); - OUString const & GetPrefix(){ return cPrefix.str();} - OUString const & GetSuffix(){ return cSuffix.str();} - bool IsDefaultPrefix(){ return !(cSubFlags&SF_OVER_PREFIX); } - bool IsDefaultSuffix(){ return !(cSubFlags&SF_OVER_SUFFIX); } - LwpColor GetColor(); + OUString const & GetPrefix() const { return cPrefix.str();} + OUString const & GetSuffix() const { return cSuffix.str();} + bool IsDefaultPrefix() const { return !(cSubFlags&SF_OVER_PREFIX); } + bool IsDefaultSuffix() const { return !(cSubFlags&SF_OVER_SUFFIX); } + LwpColor GetColor() const; private: LwpColor cColor; @@ -248,8 +248,8 @@ public: void Read(); static bool IsCurrencyFormat(sal_uInt16 Format); sal_uInt16 GetDecimalPlaces(); - bool IsDecimalPlacesOverridden(); - bool IsNegativeOverridden(); + bool IsDecimalPlacesOverridden() const; + bool IsNegativeOverridden() const; XFStyle* Convert(); private: @@ -280,13 +280,13 @@ private: }; inline bool -LwpNumericFormat::IsDecimalPlacesOverridden() +LwpNumericFormat::IsDecimalPlacesOverridden() const { return (cFlags & NF_OVER_DECIMAL_PLACES) != 0; } inline bool -LwpNumericFormat::IsNegativeOverridden() +LwpNumericFormat::IsNegativeOverridden() const { return (cFlags & NF_OVER_NEGATIVE) != 0; } diff --git a/lotuswordpro/source/filter/lwpoverride.cxx b/lotuswordpro/source/filter/lwpoverride.cxx index dcf94e0c75f7..677b3638f9f0 100644 --- a/lotuswordpro/source/filter/lwpoverride.cxx +++ b/lotuswordpro/source/filter/lwpoverride.cxx @@ -164,7 +164,7 @@ void LwpTextAttributeOverride::Read(LwpObjectStream* pStrm) pStrm->SkipExtra(); } -bool LwpTextAttributeOverride::IsHighlight() +bool LwpTextAttributeOverride::IsHighlight() const { return (m_nValues & TAO_HIGHLIGHT) != 0; } @@ -497,7 +497,7 @@ void LwpIndentOverride::Override(LwpIndentOverride* other) other->OverrideRelative(GetRelative()); } -sal_uInt16 LwpIndentOverride::GetRelative() +sal_uInt16 LwpIndentOverride::GetRelative() const { if ((m_nOverride & IO_REL_FLAGS) == IO_REL_FIRST) return RELATIVE_FIRST; @@ -506,7 +506,7 @@ sal_uInt16 LwpIndentOverride::GetRelative() return RELATIVE_REST; } -bool LwpIndentOverride::IsUseRelative() +bool LwpIndentOverride::IsUseRelative() const { return (m_nValues & IO_USE_RELATIVE) != 0; } diff --git a/lotuswordpro/source/filter/lwppagehint.hxx b/lotuswordpro/source/filter/lwppagehint.hxx index 9761b531d9b7..c4133b49159d 100644 --- a/lotuswordpro/source/filter/lwppagehint.hxx +++ b/lotuswordpro/source/filter/lwppagehint.hxx @@ -99,9 +99,9 @@ public: LwpPageHint(LwpObjectHeader const &objHdr, LwpSvStream* pStrm); void Read() override; void Parse(IXFStream* pOutputStream) override; - sal_uInt16 GetPageNumber(){return m_nPageNumber;} + sal_uInt16 GetPageNumber() const {return m_nPageNumber;} LwpObjectID& GetPageLayoutID(){ return m_PageLayout;} - sal_uInt16 GetLayoutPageNumber(){ return m_nLayoutPageNumber;} + sal_uInt16 GetLayoutPageNumber() const { return m_nLayoutPageNumber;} private: virtual ~LwpPageHint() override {} diff --git a/lotuswordpro/source/filter/lwppara.hxx b/lotuswordpro/source/filter/lwppara.hxx index 1a688304937d..00139692f992 100644 --- a/lotuswordpro/source/filter/lwppara.hxx +++ b/lotuswordpro/source/filter/lwppara.hxx @@ -164,7 +164,7 @@ public: void GetParaNumber(sal_uInt16 nPosition, ParaNumbering* pParaNumbering); LwpFribPtr& GetFribs(); - double GetBelowSpacing(); + double GetBelowSpacing() const; LwpParaProperty* GetProperty(sal_uInt32 nPropType); void GatherDropcapInfo(); const OUString& GetBulletStyleName() const; @@ -351,7 +351,7 @@ inline void LwpPara::SetDropcapLayout(LwpDropcapLayout* pLayout) { m_pDropcapLayout = pLayout; } -inline double LwpPara::GetBelowSpacing() +inline double LwpPara::GetBelowSpacing() const { return m_BelowSpacing; } diff --git a/lotuswordpro/source/filter/lwpparaborderoverride.hxx b/lotuswordpro/source/filter/lwpparaborderoverride.hxx index 7102eae35513..cb711052c1d0 100644 --- a/lotuswordpro/source/filter/lwpparaborderoverride.hxx +++ b/lotuswordpro/source/filter/lwpparaborderoverride.hxx @@ -89,19 +89,19 @@ public: void Override(LwpParaBorderOverride* pOther); - inline bool IsBorderStuffOverridden(); - inline bool IsBetweenStuffOverridden(); - inline bool IsShadowOverridden(); - inline bool IsMarginsOverridden(); - inline bool IsAboveTypeOverridden(); - inline bool IsBelowTypeOverridden(); - inline bool IsRightTypeOverridden(); - inline bool IsBetweenTypeOverridden(); - inline bool IsAboveWidthOverridden(); - inline bool IsBelowWidthOverridden(); - inline bool IsBetweenWidthOverridden(); - inline bool IsRightWidthOverridden(); - inline bool IsBetweenMarginOverridden(); + inline bool IsBorderStuffOverridden() const; + inline bool IsBetweenStuffOverridden() const; + inline bool IsShadowOverridden() const; + inline bool IsMarginsOverridden() const; + inline bool IsAboveTypeOverridden() const; + inline bool IsBelowTypeOverridden() const; + inline bool IsRightTypeOverridden() const; + inline bool IsBetweenTypeOverridden() const; + inline bool IsAboveWidthOverridden() const; + inline bool IsBelowWidthOverridden() const; + inline bool IsBetweenWidthOverridden() const; + inline bool IsRightWidthOverridden() const; + inline bool IsBetweenMarginOverridden() const; void OverrideBorderStuff(LwpBorderStuff const * pBorderStuff); void OverrideBetweenStuff(LwpBorderStuff const * pBorderStuff); @@ -172,55 +172,55 @@ private: sal_uInt32 m_nBetweenMargin; }; -inline bool LwpParaBorderOverride::IsBorderStuffOverridden() +inline bool LwpParaBorderOverride::IsBorderStuffOverridden() const { return ((m_nOverride & PBO_STUFF) != 0); } -inline bool LwpParaBorderOverride::IsBetweenStuffOverridden() +inline bool LwpParaBorderOverride::IsBetweenStuffOverridden() const { return ((m_nOverride & PBO_BETWEENSTUFF) != 0); } -inline bool LwpParaBorderOverride::IsShadowOverridden() +inline bool LwpParaBorderOverride::IsShadowOverridden() const { return ((m_nOverride & PBO_SHADOW) != 0); } -inline bool LwpParaBorderOverride::IsMarginsOverridden() +inline bool LwpParaBorderOverride::IsMarginsOverridden() const { return ((m_nOverride & PBO_MARGINS) != 0); } -inline bool LwpParaBorderOverride::IsAboveTypeOverridden() +inline bool LwpParaBorderOverride::IsAboveTypeOverridden() const { return ((m_nOverride & PBO_ABOVETYPE) != 0); } -inline bool LwpParaBorderOverride::IsBelowTypeOverridden() +inline bool LwpParaBorderOverride::IsBelowTypeOverridden() const { return ((m_nOverride & PBO_BELOWTYPE) != 0); } -inline bool LwpParaBorderOverride::IsRightTypeOverridden() +inline bool LwpParaBorderOverride::IsRightTypeOverridden() const { return ((m_nOverride & PBO_RIGHTTYPE) != 0); } -inline bool LwpParaBorderOverride::IsBetweenTypeOverridden() +inline bool LwpParaBorderOverride::IsBetweenTypeOverridden() const { return ((m_nOverride & PBO_BETWEENTYPE) != 0); } -inline bool LwpParaBorderOverride::IsAboveWidthOverridden() +inline bool LwpParaBorderOverride::IsAboveWidthOverridden() const { return ((m_nOverride & PBO_ABOVE) != 0); } -inline bool LwpParaBorderOverride::IsBelowWidthOverridden() +inline bool LwpParaBorderOverride::IsBelowWidthOverridden() const { return ((m_nOverride & PBO_BELOW) != 0); } -inline bool LwpParaBorderOverride::IsBetweenWidthOverridden() +inline bool LwpParaBorderOverride::IsBetweenWidthOverridden() const { return ((m_nOverride & PBO_BETWEEN) != 0); } -inline bool LwpParaBorderOverride::IsRightWidthOverridden() +inline bool LwpParaBorderOverride::IsRightWidthOverridden() const { return ((m_nOverride & PBO_RIGHT) != 0); } -inline bool LwpParaBorderOverride::IsBetweenMarginOverridden() +inline bool LwpParaBorderOverride::IsBetweenMarginOverridden() const { return ((m_nOverride & PBO_BETWEENMARGIN) != 0); } diff --git a/lotuswordpro/source/filter/lwpparaproperty.hxx b/lotuswordpro/source/filter/lwpparaproperty.hxx index f00e7fb0a905..4b4f6fca6ec6 100644 --- a/lotuswordpro/source/filter/lwpparaproperty.hxx +++ b/lotuswordpro/source/filter/lwpparaproperty.hxx @@ -118,13 +118,13 @@ public: virtual ~LwpParaIndentProperty() override; LwpIndentOverride* GetIndent(); sal_uInt32 GetType() override; - inline const LwpObjectID& GetIndentID(); + inline const LwpObjectID& GetIndentID() const; private: LwpObjectID m_aIndentID; LwpIndentOverride* m_pIndent; }; -inline const LwpObjectID& LwpParaIndentProperty::GetIndentID() +inline const LwpObjectID& LwpParaIndentProperty::GetIndentID() const { return m_aIndentID; } diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx index 4afe02ae2d29..f7fc6979746d 100644 --- a/lotuswordpro/source/filter/lwpparastyle.cxx +++ b/lotuswordpro/source/filter/lwpparastyle.cxx @@ -359,7 +359,7 @@ void LwpParaStyle::ApplyParaBorder(XFParaStyle* pParaStyle, LwpParaBorderOverrid } } -void LwpParaStyle::ApplyBreaks(XFParaStyle* pParaStyle, LwpBreaksOverride* pBreaks) +void LwpParaStyle::ApplyBreaks(XFParaStyle* pParaStyle, const LwpBreaksOverride* pBreaks) { if (pBreaks->IsKeepWithNext()) { @@ -383,7 +383,7 @@ void LwpParaStyle::ApplyBreaks(XFParaStyle* pParaStyle, LwpBreaksOverride* pBrea } } -void LwpParaStyle::ApplyAlignment(XFParaStyle* pParaStyle, LwpAlignmentOverride* pAlign) +void LwpParaStyle::ApplyAlignment(XFParaStyle* pParaStyle, const LwpAlignmentOverride* pAlign) { enumXFAlignType alignType = enumXFAlignStart; LwpAlignmentOverride::AlignType type; @@ -418,7 +418,7 @@ void LwpParaStyle::ApplyAlignment(XFParaStyle* pParaStyle, LwpAlignmentOverride* pParaStyle->SetAlignType(alignType); } -void LwpParaStyle::ApplyIndent(LwpPara* pPara, XFParaStyle* pParaStyle, LwpIndentOverride* pIndent) +void LwpParaStyle::ApplyIndent(LwpPara* pPara, XFParaStyle* pParaStyle, const LwpIndentOverride* pIndent) { LwpPara* pParentPara; if (pPara) diff --git a/lotuswordpro/source/filter/lwpparastyle.hxx b/lotuswordpro/source/filter/lwpparastyle.hxx index 3dc461ae1518..7c46c4238ce0 100644 --- a/lotuswordpro/source/filter/lwpparastyle.hxx +++ b/lotuswordpro/source/filter/lwpparastyle.hxx @@ -82,9 +82,9 @@ public: void Apply(XFParaStyle *pStrm); static void ApplyParaBorder(XFParaStyle* pParaStyle, LwpParaBorderOverride* pBorder); - static void ApplyBreaks(XFParaStyle* pParaStyle, LwpBreaksOverride* pBreaks); - static void ApplyAlignment(XFParaStyle* pParaStyle, LwpAlignmentOverride* pAlign); - static void ApplyIndent(LwpPara* pPara, XFParaStyle* pParaStyle, LwpIndentOverride* pIndent); + static void ApplyBreaks(XFParaStyle* pParaStyle, const LwpBreaksOverride* pBreaks); + static void ApplyAlignment(XFParaStyle* pParaStyle, const LwpAlignmentOverride* pAlign); + static void ApplyIndent(LwpPara* pPara, XFParaStyle* pParaStyle, const LwpIndentOverride* pIndent); static void ApplySpacing(LwpPara* pPara, XFParaStyle* pParaStyle, LwpSpacingOverride* pSpacing); static void ApplyTab(XFParaStyle* pParaStyle, LwpTabOverride* pTab); diff --git a/lotuswordpro/source/filter/lwpproplist.hxx b/lotuswordpro/source/filter/lwpproplist.hxx index 7398a995cc85..df1902c482c0 100644 --- a/lotuswordpro/source/filter/lwpproplist.hxx +++ b/lotuswordpro/source/filter/lwpproplist.hxx @@ -72,8 +72,8 @@ public: void Read() override; bool IsNamed(const OUString& name); LwpPropListElement* GetNext(); - const LwpAtomHolder& GetValue(){return m_Value;} - const LwpAtomHolder& GetName(){return m_Name;} + const LwpAtomHolder& GetValue() const {return m_Value;} + const LwpAtomHolder& GetName() const {return m_Name;} private: virtual ~LwpPropListElement() override {} diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx b/lotuswordpro/source/filter/lwprowlayout.cxx index f9b851fd7b8f..4648d1ec00e4 100644 --- a/lotuswordpro/source/filter/lwprowlayout.cxx +++ b/lotuswordpro/source/filter/lwprowlayout.cxx @@ -468,7 +468,7 @@ void LwpRowLayout::SetCellSplit(sal_uInt16 nEffectRows) /** * @short check if the row has merge cell */ -bool LwpRowLayout::GetMergeCellFlag() +bool LwpRowLayout::GetMergeCellFlag() const { return !m_ConnCellList.empty(); } diff --git a/lotuswordpro/source/filter/lwprowlayout.hxx b/lotuswordpro/source/filter/lwprowlayout.hxx index e393c6908779..ad2c9eacb959 100644 --- a/lotuswordpro/source/filter/lwprowlayout.hxx +++ b/lotuswordpro/source/filter/lwprowlayout.hxx @@ -78,7 +78,7 @@ public: LwpRowLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm); virtual ~LwpRowLayout() override; virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_ROW_LAYOUT;} - sal_uInt16 GetRowID() { return crowid;} + sal_uInt16 GetRowID() const { return crowid;} virtual void RegisterStyle() override; LwpTableLayout * GetParentTableLayout(){return dynamic_cast<LwpTableLayout *>(GetParent().obj().get());} void SetRowMap(); @@ -105,7 +105,7 @@ public: void ConvertCommonRow(rtl::Reference<XFTable> const & pXFTable, sal_uInt8 nStartCol, sal_uInt8 nEndCol); void CollectMergeInfo(); void SetCellSplit(sal_uInt16 nEffectRows); - bool GetMergeCellFlag(); + bool GetMergeCellFlag() const; sal_uInt16 GetCurMaxSpannedRows(sal_uInt8 nStartCol,sal_uInt8 nEndCol); void RegisterCurRowStyle(XFRow* pXFRow,sal_uInt16 nRowMark); }; diff --git a/lotuswordpro/source/filter/lwpsection.cxx b/lotuswordpro/source/filter/lwpsection.cxx index 27b61fcc9d82..864f7e1f5280 100644 --- a/lotuswordpro/source/filter/lwpsection.cxx +++ b/lotuswordpro/source/filter/lwpsection.cxx @@ -142,13 +142,13 @@ void LwpIndexSection::Read() m_pObjStrm->SkipExtra(); } -bool LwpIndexSection::IsFormatRunin() +bool LwpIndexSection::IsFormatRunin() const { return (m_nFlags & RUN_IN) != 0; } -bool LwpIndexSection::IsFormatSeparator() +bool LwpIndexSection::IsFormatSeparator() const { return (m_nFlags & SEPARATORS) != 0; diff --git a/lotuswordpro/source/filter/lwpsection.hxx b/lotuswordpro/source/filter/lwpsection.hxx index 7ba45ceba32e..a3678fb0ed89 100644 --- a/lotuswordpro/source/filter/lwpsection.hxx +++ b/lotuswordpro/source/filter/lwpsection.hxx @@ -92,7 +92,7 @@ public: virtual ~LwpSection() override; inline LwpPageLayout* GetPageLayout(); void Parse(IXFStream* pOutputStream) override; - OUString const & GetSectionName(){return m_AtomHolder.str();} + OUString const & GetSectionName() const {return m_AtomHolder.str();} protected: void Read() override; @@ -118,8 +118,8 @@ class LwpIndexSection : public LwpSection public: LwpIndexSection(LwpObjectHeader const &objHdr, LwpSvStream* pStrm); virtual ~LwpIndexSection() override; - bool IsFormatRunin(); - bool IsFormatSeparator(); + bool IsFormatRunin() const; + bool IsFormatSeparator() const; protected: void Read() override; private: diff --git a/lotuswordpro/source/filter/lwpshadow.hxx b/lotuswordpro/source/filter/lwpshadow.hxx index 5d27ce7b544c..7e38f78b23ba 100644 --- a/lotuswordpro/source/filter/lwpshadow.hxx +++ b/lotuswordpro/source/filter/lwpshadow.hxx @@ -80,7 +80,7 @@ public: double GetOffsetY(); - const LwpColor& GetColor(); + const LwpColor& GetColor() const; private: LwpColor m_aColor; @@ -99,7 +99,7 @@ inline double LwpShadow::GetOffsetY() return LwpTools::ConvertFromUnitsToMetric(m_nDirY); } -inline const LwpColor& LwpShadow::GetColor() +inline const LwpColor& LwpShadow::GetColor() const { return m_aColor; } diff --git a/lotuswordpro/source/filter/lwpsilverbullet.cxx b/lotuswordpro/source/filter/lwpsilverbullet.cxx index 78aa35c94f98..7370d7f5d0f4 100644 --- a/lotuswordpro/source/filter/lwpsilverbullet.cxx +++ b/lotuswordpro/source/filter/lwpsilverbullet.cxx @@ -215,7 +215,7 @@ OUString LwpSilverBullet::GetBulletFontName() * @descr: * @return: An UChar32 bullet character. */ -OUString const & LwpSilverBullet::GetBulletChar() +OUString const & LwpSilverBullet::GetBulletChar() const { return m_xBulletPara->GetBulletChar(); } @@ -428,7 +428,7 @@ OUString LwpSilverBullet::GetDivisionName() return aRet; } -OUString LwpSilverBullet::GetSectionName() +OUString LwpSilverBullet::GetSectionName() const { LwpStory* pStory = dynamic_cast<LwpStory*>(m_aStory.obj(VO_STORY).get()); if (!pStory) diff --git a/lotuswordpro/source/filter/lwpsilverbullet.hxx b/lotuswordpro/source/filter/lwpsilverbullet.hxx index 2f04feb4e487..5bf34b396254 100644 --- a/lotuswordpro/source/filter/lwpsilverbullet.hxx +++ b/lotuswordpro/source/filter/lwpsilverbullet.hxx @@ -104,7 +104,7 @@ public: const OUString& GetBulletStyleName() const; - OUString const & GetBulletChar(); + OUString const & GetBulletChar() const; static OUString GetPrefix() { return OUString(); } @@ -124,7 +124,7 @@ public: OUString GetDivisionName(); - OUString GetSectionName(); + OUString GetSectionName() const; private: sal_uInt16 m_nFlags; diff --git a/lotuswordpro/source/filter/lwpstory.hxx b/lotuswordpro/source/filter/lwpstory.hxx index cee4a562a39c..2257b88fffa5 100644 --- a/lotuswordpro/source/filter/lwpstory.hxx +++ b/lotuswordpro/source/filter/lwpstory.hxx @@ -108,13 +108,13 @@ public: XFContentContainer* GetXFContent(); void AddXFContent(XFContent* pContent); - bool GetDropcapFlag() { return m_bDropcap; } + bool GetDropcapFlag() const { return m_bDropcap; } LwpPageLayout* GetCurrentLayout() { return m_pCurrentLayout; } inline LwpMiddleLayout* GetTabLayout();//for register tab style - const OUString& GetSectionName() { return m_CurrSectionName; } + const OUString& GetSectionName() const { return m_CurrSectionName; } LwpHyperlinkMgr* GetHyperlinkMgr() { return m_pHyperlinkMgr.get(); } - bool IsPMModified() { return m_bPMModified; } + bool IsPMModified() const { return m_bPMModified; } inline void SetPMModified(bool bPMModified); inline void SetDropcapFlag(bool bFlag); inline void SetTabLayout(LwpLayout* pLayout); diff --git a/lotuswordpro/source/filter/lwptable.cxx b/lotuswordpro/source/filter/lwptable.cxx index 31d55cc6895f..ae29a8f4563e 100644 --- a/lotuswordpro/source/filter/lwptable.cxx +++ b/lotuswordpro/source/filter/lwptable.cxx @@ -127,7 +127,7 @@ void LwpTable::Read() m_pObjStrm->SkipExtra(); } -bool LwpTable::IsNumberDown() +bool LwpTable::IsNumberDown() const { return (m_nAttributes & NUMBER_DOWN) != 0; } @@ -186,7 +186,7 @@ LwpGlossary::LwpGlossary(LwpObjectHeader const &objHdr, LwpSvStream* pStrm):LwpP LwpGlossary::~LwpGlossary() { } -sal_uInt16 LwpGlossary::GetNumIndexRows() +sal_uInt16 LwpGlossary::GetNumIndexRows() const { if (GetRow() > 0 && GetRow() <= MAX_NUM_ROWS) return GetRow() - 1; // Minus one row for repeated heading. diff --git a/lotuswordpro/source/filter/lwptable.hxx b/lotuswordpro/source/filter/lwptable.hxx index 9a6ffb39b372..2f40600fe556 100644 --- a/lotuswordpro/source/filter/lwptable.hxx +++ b/lotuswordpro/source/filter/lwptable.hxx @@ -116,13 +116,13 @@ public: double GetWidth() {return LwpTools::ConvertFromUnitsToMetric(m_nWidth);} double GetHeight() {return LwpTools::ConvertFromUnitsToMetric(m_nHeight);} LwpObjectID& GetDefaultCellStyle() {return m_DefaultCellStyle;} - sal_uInt16 GetRow() {return m_nRow;} - sal_uInt16 GetColumn() {return m_nColumn;} + sal_uInt16 GetRow() const {return m_nRow;} + sal_uInt16 GetColumn() const {return m_nColumn;} rtl::Reference<LwpTableLayout> GetTableLayout() { return rtl::Reference<LwpTableLayout>(dynamic_cast<LwpTableLayout*>(GetLayout(nullptr).get())); } - bool IsNumberDown(); + bool IsNumberDown() const; virtual bool IsTable() override { return true;} LwpSuperTableLayout* GetSuperTableLayout(); protected: @@ -182,7 +182,7 @@ public: virtual ~LwpGlossary() override; private: void Read() override; - sal_uInt16 GetNumIndexRows(); + sal_uInt16 GetNumIndexRows() const; }; #endif diff --git a/lotuswordpro/source/filter/lwptablelayout.hxx b/lotuswordpro/source/filter/lwptablelayout.hxx index 29d462359be8..5e232dba73b4 100644 --- a/lotuswordpro/source/filter/lwptablelayout.hxx +++ b/lotuswordpro/source/filter/lwptablelayout.hxx @@ -131,10 +131,10 @@ public: void XFConvert(XFContentContainer* pCont) override; void ConvertTable(rtl::Reference<XFTable> const & pXFTable, sal_uInt16 nStartRow, sal_uInt16 nEndRow,sal_uInt8 nStartCol,sal_uInt8 nEndCol); - const OUString& GetDefaultRowStyleName(){return m_DefaultRowStyleName;} + const OUString& GetDefaultRowStyleName() const {return m_DefaultRowStyleName;} void SetCellsMap(sal_uInt16 nRow,sal_uInt8 nCol,XFCell* pXFCell); XFCell* GetCellsMap(sal_uInt16 nRow,sal_uInt8 nCol); - const std::map<sal_uInt16,LwpRowLayout*>& GetRowsMap(){return m_RowsMap;} + const std::map<sal_uInt16,LwpRowLayout*>& GetRowsMap() const {return m_RowsMap;} LwpRowLayout* GetRowLayout(sal_uInt16 nRow); private: void ConvertDefaultRow(rtl::Reference<XFTable> const & pXFTable, sal_uInt8 nStartCol, @@ -196,11 +196,11 @@ public: LwpColumnLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm); virtual ~LwpColumnLayout() override; virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_COLUMN_LAYOUT;} - sal_uInt32 GetColumnID(){return ccolid;} + sal_uInt32 GetColumnID() const {return ccolid;} double GetWidth() override {return LwpTools::ConvertFromUnitsToMetric(cwidth);} using LwpVirtualLayout::RegisterStyle; void RegisterStyle(double dCalculatedWidth); - bool IsJustifiable(){return (( m_nAttributes2 & STYLE2_JUSTIFIABLE) != 0);} + bool IsJustifiable() const {return (( m_nAttributes2 & STYLE2_JUSTIFIABLE) != 0);} protected: void Read() override; private: diff --git a/lotuswordpro/source/filter/lwptabrack.hxx b/lotuswordpro/source/filter/lwptabrack.hxx index 0e837547a585..d29aaada28f9 100644 --- a/lotuswordpro/source/filter/lwptabrack.hxx +++ b/lotuswordpro/source/filter/lwptabrack.hxx @@ -95,10 +95,10 @@ public: }; public: void Read(LwpObjectStream *pStrm); - inline sal_uInt32 GetPosition(); - inline TabType GetTabType(); - inline LeaderType GetLeaderType(); - inline sal_uInt16 GetAlignChar(); + inline sal_uInt32 GetPosition() const; + inline TabType GetTabType() const; + inline LeaderType GetLeaderType() const; + inline sal_uInt16 GetAlignChar() const; private: sal_uInt32 m_nX; @@ -108,22 +108,22 @@ private: sal_uInt16 m_nAlignChar; //be careful }; -inline sal_uInt32 LwpTab::GetPosition() +inline sal_uInt32 LwpTab::GetPosition() const { return m_nX; } -inline LwpTab::TabType LwpTab::GetTabType() +inline LwpTab::TabType LwpTab::GetTabType() const { return static_cast<LwpTab::TabType>(m_nType); } -inline LwpTab::LeaderType LwpTab::GetLeaderType() +inline LwpTab::LeaderType LwpTab::GetLeaderType() const { return static_cast<LwpTab::LeaderType>(m_nLeader); } -inline sal_uInt16 LwpTab::GetAlignChar() +inline sal_uInt16 LwpTab::GetAlignChar() const { return m_nAlignChar; } diff --git a/lotuswordpro/source/filter/lwptblcell.hxx b/lotuswordpro/source/filter/lwptblcell.hxx index 567edfc99caf..4303cc9c05b6 100644 --- a/lotuswordpro/source/filter/lwptblcell.hxx +++ b/lotuswordpro/source/filter/lwptblcell.hxx @@ -83,7 +83,7 @@ public: virtual void Parse(IXFStream* pOutputStream) override; LwpObjectID const & GetNextID(){return GetNext();} - sal_uInt8 GetColumnID(){return cColumn;} + sal_uInt8 GetColumnID() const {return cColumn;} virtual void Convert(XFCell * pCell, LwpTableLayout* pCellsMap=nullptr); protected: @@ -107,7 +107,7 @@ public: void Parse(IXFStream* pOutputStream) override; LwpObjectID const & GetChildHeadID(){return cChild.GetHead();} LwpObjectID const & GetNextID(){return GetNext();} - sal_uInt16 GetRowID(){return cRowID;} + sal_uInt16 GetRowID() const {return cRowID;} private: void Read() override; virtual ~LwpRowList() override; @@ -125,7 +125,7 @@ class LwpNumericValue final : public LwpObject public: LwpNumericValue(LwpObjectHeader const &objHdr, LwpSvStream* pStrm); - double GetValue(){return cNumber;} + double GetValue() const {return cNumber;} void Parse(IXFStream* pOutputStream) override; private: void Read() override; @@ -144,8 +144,8 @@ public: LwpTableRange(LwpObjectHeader const &objHdr, LwpSvStream* pStrm); void Parse(IXFStream* pOutputStream) override; - const LwpObjectID& GetCellRangeID(){return cpCellRange;} - const LwpObjectID& GetTableID(){ return cqTable;} + const LwpObjectID& GetCellRangeID() const {return cpCellRange;} + const LwpObjectID& GetTableID() const { return cqTable;} LwpTableRange* GetNext() { return dynamic_cast<LwpTableRange*>(LwpDLVList::GetNext().obj().get());} private: void Read() override; @@ -164,7 +164,7 @@ public: LwpCellRange(LwpObjectHeader const &objHdr, LwpSvStream* pStrm); void Parse(IXFStream* pOutputStream) override; - const LwpObjectID& GetFolderID(){return cpFolder;} + const LwpObjectID& GetFolderID() const {return cpFolder;} private: void Read() override; virtual ~LwpCellRange() override; @@ -227,11 +227,11 @@ class LwpRowColumnQualifier public: LwpRowColumnQualifier(); - bool IsAbsolute(); + bool IsAbsolute() const; - bool IsAfter(); + bool IsAfter() const; - bool IsBad(); + bool IsBad() const; void QuickRead(LwpObjectStream *pStrm); @@ -252,19 +252,19 @@ LwpRowColumnQualifier::LwpRowColumnQualifier() } inline bool -LwpRowColumnQualifier::IsAfter() +LwpRowColumnQualifier::IsAfter() const { return (cFlags & REF_AFTER) != 0; } inline bool -LwpRowColumnQualifier::IsBad() +LwpRowColumnQualifier::IsBad() const { return (cFlags & REF_BAD) != 0; } inline bool -LwpRowColumnQualifier::IsAbsolute() +LwpRowColumnQualifier::IsAbsolute() const { return (cFlags & REF_ABSOLUTE) != 0; } diff --git a/lotuswordpro/source/filter/lwptblformula.hxx b/lotuswordpro/source/filter/lwptblformula.hxx index 8c4a8979a7db..458b6513105b 100644 --- a/lotuswordpro/source/filter/lwptblformula.hxx +++ b/lotuswordpro/source/filter/lwptblformula.hxx @@ -139,8 +139,8 @@ class LwpFormulaCellAddr:public LwpFormulaArg public: LwpFormulaCellAddr(sal_Int16 aCol, sal_Int16 aRow); - sal_Int16 GetCol(){return m_aCol;} - sal_Int16 GetRow(){return m_aRow;} + sal_Int16 GetCol() const {return m_aCol;} + sal_Int16 GetRow() const {return m_aRow;} virtual OUString ToString(LwpTableLayout* pCellsMap) override; private: diff --git a/lotuswordpro/source/filter/lwptoc.hxx b/lotuswordpro/source/filter/lwptoc.hxx index 7e8b20403c65..8516124c82c0 100644 --- a/lotuswordpro/source/filter/lwptoc.hxx +++ b/lotuswordpro/source/filter/lwptoc.hxx @@ -147,10 +147,10 @@ public: LwpTocLevelData(LwpObjectHeader const &objHdr, LwpSvStream* pStrm); void RegisterStyle() override; virtual void XFConvert(XFContentContainer* pCont) override; - sal_uInt16 GetLevel(){return m_nLevel;} - bool GetUseText(){ return (m_nFlags & USETEXT) != 0;} - OUString const & GetSearchStyle(){return m_SearchName.str();} - bool GetUseLeadingText(){ return (m_nFlags & USENUMBER) != 0;} + sal_uInt16 GetLevel() const {return m_nLevel;} + bool GetUseText() const { return (m_nFlags & USETEXT) != 0;} + OUString const & GetSearchStyle() const {return m_SearchName.str();} + bool GetUseLeadingText() const { return (m_nFlags & USENUMBER) != 0;} private: virtual ~LwpTocLevelData() override; diff --git a/lotuswordpro/source/filter/lwpusewhen.hxx b/lotuswordpro/source/filter/lwpusewhen.hxx index 9b89a3b1ac9f..8cfc3128260b 100644 --- a/lotuswordpro/source/filter/lwpusewhen.hxx +++ b/lotuswordpro/source/filter/lwpusewhen.hxx @@ -92,18 +92,18 @@ public: inline void Read(LwpObjectStream* pStrm); - inline bool IsUseOnAllPages(); - inline bool IsUseOnAllEvenPages(); - inline bool IsUseOnAllOddPages(); - inline bool IsUseOnPage(); - - inline bool IsStartOnThisPage(); - inline bool IsStartOnNextPage(); - inline bool IsStartOnNextEvenPage(); - inline bool IsStartOnNextOddPage(); - inline bool IsStartOnThisHF(); - - inline sal_uInt16 GetUsePage(); + inline bool IsUseOnAllPages() const; + inline bool IsUseOnAllEvenPages() const; + inline bool IsUseOnAllOddPages() const; + inline bool IsUseOnPage() const; + + inline bool IsStartOnThisPage() const; + inline bool IsStartOnNextPage() const; + inline bool IsStartOnNextEvenPage() const; + inline bool IsStartOnNextOddPage() const; + inline bool IsStartOnThisHF() const; + + inline sal_uInt16 GetUsePage() const; private: sal_uInt16 m_nFlags; sal_uInt16 m_nUsePage; @@ -115,50 +115,50 @@ inline void LwpUseWhen::Read(LwpObjectStream* pStrm) m_nUsePage = pStrm->QuickReaduInt16(); pStrm->SkipExtra(); } -inline bool LwpUseWhen::IsUseOnAllPages() +inline bool LwpUseWhen::IsUseOnAllPages() const { return ((m_nFlags & STYLE_USEONALLPAGES) != 0); } -inline bool LwpUseWhen::IsUseOnAllEvenPages() +inline bool LwpUseWhen::IsUseOnAllEvenPages() const { return ((m_nFlags & STYLE_USEONALLEVENPAGES) != 0); } -inline bool LwpUseWhen::IsUseOnAllOddPages() +inline bool LwpUseWhen::IsUseOnAllOddPages() const { return ((m_nFlags & STYLE_USEONALLODDPAGES) != 0); } -inline bool LwpUseWhen::IsUseOnPage() +inline bool LwpUseWhen::IsUseOnPage() const { return ((m_nFlags & STYLE_USEONTHISPAGE) != 0); } -inline bool LwpUseWhen::IsStartOnThisPage() +inline bool LwpUseWhen::IsStartOnThisPage() const { return ((m_nFlags & STYLE_STARTONTHISPAGE) != 0); } -inline bool LwpUseWhen::IsStartOnNextPage() +inline bool LwpUseWhen::IsStartOnNextPage() const { return ((m_nFlags & STYLE_STARTONMASK) == 0); } -inline bool LwpUseWhen::IsStartOnNextOddPage() +inline bool LwpUseWhen::IsStartOnNextOddPage() const { return ((m_nFlags & STYLE_STARTONNEXTODD) != 0); } -inline bool LwpUseWhen::IsStartOnNextEvenPage() +inline bool LwpUseWhen::IsStartOnNextEvenPage() const { return ((m_nFlags & STYLE_STARTONNEXTEVEN) != 0); } -inline bool LwpUseWhen::IsStartOnThisHF() +inline bool LwpUseWhen::IsStartOnThisHF() const { return ((m_nFlags & STYLE_STARTONTHISHF) != 0); } -inline sal_uInt16 LwpUseWhen::GetUsePage() +inline sal_uInt16 LwpUseWhen::GetUsePage() const { return m_nUsePage; } diff --git a/lotuswordpro/source/filter/xfilter/xfdrawareastyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawareastyle.hxx index bfc72f71c2cd..6775b049cf8d 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawareastyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawareastyle.hxx @@ -82,9 +82,9 @@ public: void SetLineSpace(double space); - enumXFAreaStyle GetAreaStyle(); + enumXFAreaStyle GetAreaStyle() const; - const XFColor& GetBackColor(); + const XFColor& GetBackColor() const; virtual enumXFStyle GetStyleFamily() override; @@ -129,12 +129,12 @@ inline void XFDrawAreaStyle::SetLineSpace(double space) m_fSpace = space; } -inline enumXFAreaStyle XFDrawAreaStyle::GetAreaStyle() +inline enumXFAreaStyle XFDrawAreaStyle::GetAreaStyle() const { return m_eAreaStyle; } -inline const XFColor& XFDrawAreaStyle::GetBackColor() +inline const XFColor& XFDrawAreaStyle::GetBackColor() const { return m_aBackColor; } diff --git a/lotuswordpro/source/filter/xfilter/xfframe.cxx b/lotuswordpro/source/filter/xfilter/xfframe.cxx index cfda8563de96..8b469c31eddf 100644 --- a/lotuswordpro/source/filter/xfilter/xfframe.cxx +++ b/lotuswordpro/source/filter/xfilter/xfframe.cxx @@ -104,7 +104,7 @@ void XFFrame::SetZIndex(sal_uInt32 zIndex) AdjustZIndex(); } -enumXFFrameType XFFrame::GetFrameType() +enumXFFrameType XFFrame::GetFrameType() const { return m_eType; } diff --git a/lotuswordpro/source/filter/xfilter/xfparagraph.cxx b/lotuswordpro/source/filter/xfilter/xfparagraph.cxx index 6f68bf2f185b..478513cbb7ac 100644 --- a/lotuswordpro/source/filter/xfilter/xfparagraph.cxx +++ b/lotuswordpro/source/filter/xfilter/xfparagraph.cxx @@ -100,7 +100,7 @@ void XFParagraph::ToXml(IXFStream *pStrm) pStrm->EndElement( "text:p" ); } -bool XFParagraph::HasContents() +bool XFParagraph::HasContents() const { return GetCount()>0; } diff --git a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx index 6cf81dbd5e30..34ddb7d09363 100644 --- a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx +++ b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx @@ -313,7 +313,7 @@ void XFStyleManager::ToXml(IXFStream *pStrm) pStrm->StartElement( "office:font-decls" ); //font declarations: - for (auto & fontDecl : s_aFontDecls) + for (const auto & fontDecl : s_aFontDecls) { pAttrList->Clear(); pAttrList->AddAttribute( "style:name", fontDecl.GetFontName() ); |