diff options
author | Noel Grandin <noel@peralex.com> | 2014-06-09 10:09:42 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-06-09 10:10:13 +0200 |
commit | 184a00b96235f6432294ded63ce4a4a318effdb5 (patch) | |
tree | e4ae0e00cb168fa43d280cfb51a50515258b5320 /lotuswordpro | |
parent | 534015ad4fd08823b4393dab1ad5d42dedd7bf62 (diff) |
loplugin: inlinesimplememberfunctions
Change-Id: I42119f656ca528286fb25d2d36c0af54b7d04a6b
Diffstat (limited to 'lotuswordpro')
-rw-r--r-- | lotuswordpro/source/filter/lwpbasetype.hxx | 6 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpdlvlist.hxx | 70 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpdropcapmgr.cxx | 4 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpdropcapmgr.hxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwplayout.cxx | 8 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwplayout.hxx | 6 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpparastyle.cxx | 4 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpparastyle.hxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpsdwrect.cxx | 9 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpsdwrect.hxx | 6 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpstory.hxx | 30 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xffontdecl.cxx | 4 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xffontdecl.hxx | 2 |
13 files changed, 34 insertions, 119 deletions
diff --git a/lotuswordpro/source/filter/lwpbasetype.hxx b/lotuswordpro/source/filter/lwpbasetype.hxx index 7a2359d4ec84..e12297e03d9a 100644 --- a/lotuswordpro/source/filter/lwpbasetype.hxx +++ b/lotuswordpro/source/filter/lwpbasetype.hxx @@ -112,8 +112,8 @@ public: LwpPoint(); void Read(LwpObjectStream *pStrm); void Reset(); - inline sal_Int32 GetX() const; - inline sal_Int32 GetY() const; + sal_Int32 GetX() const {return m_nX;} + sal_Int32 GetY() const {return m_nY;} inline void SetX(sal_Int32 nX); inline void SetY(sal_Int32 nY); protected: @@ -121,8 +121,6 @@ protected: sal_Int32 m_nY; }; -sal_Int32 LwpPoint::GetX() const {return m_nX;} -sal_Int32 LwpPoint::GetY() const {return m_nY;} void LwpPoint::SetX(sal_Int32 nX){m_nX = nX;} void LwpPoint::SetY(sal_Int32 nY){m_nY = nY;} diff --git a/lotuswordpro/source/filter/lwpdlvlist.hxx b/lotuswordpro/source/filter/lwpdlvlist.hxx index 6c90a82b51fd..7b36c34f0179 100644 --- a/lotuswordpro/source/filter/lwpdlvlist.hxx +++ b/lotuswordpro/source/filter/lwpdlvlist.hxx @@ -67,9 +67,10 @@ #include "lwpatomholder.hxx" #include "lwpobj.hxx" + /** * @brief Double Linked Virtual List -*/ + */ class LwpDLVList : public LwpObject { public: @@ -82,20 +83,13 @@ protected: protected: void Read() SAL_OVERRIDE; public: - inline LwpObjectID* GetNext(); - inline LwpObjectID* GetPrevious(); + LwpObjectID* GetNext() { return &m_ListNext; } + LwpObjectID* GetPrevious() { return &m_ListPrevious; } }; -LwpObjectID* LwpDLVList::GetNext() -{ - return &m_ListNext; -} -LwpObjectID* LwpDLVList::GetPrevious() -{ - return &m_ListPrevious; -} + /** * @brief Double Linked Named Family Virtual List -*/ + */ class LwpDLNFVList : public LwpDLVList { public: @@ -112,32 +106,13 @@ protected: void ReadName(LwpObjectStream* pObjStrm); public: // 01/17/2005 - inline LwpAtomHolder* GetName(); + LwpAtomHolder* GetName() { return &m_Name; } //end - inline LwpObjectID* GetChildHead(); - inline LwpObjectID* GetChildTail(); - inline LwpObjectID* GetParent(); + LwpObjectID* GetChildHead() { return &m_ChildHead; } + LwpObjectID* GetChildTail() { return &m_ChildTail; } + LwpObjectID* GetParent() { return &m_Parent; } }; -LwpAtomHolder* LwpDLNFVList::GetName() -{ - return &m_Name; -} - -LwpObjectID* LwpDLNFVList::GetChildHead() -{ - return &m_ChildHead; -} - -LwpObjectID* LwpDLNFVList::GetChildTail() -{ - return &m_ChildTail; -} - -LwpObjectID* LwpDLNFVList::GetParent() -{ - return &m_Parent; -} class LwpPropList; /** @@ -155,14 +130,9 @@ protected: void Read() SAL_OVERRIDE; void ReadPropertyList(LwpObjectStream* pObjStrm); public: - inline LwpPropList* GetPropList(); + LwpPropList* GetPropList() { return m_pPropList; } }; -LwpPropList* LwpDLNFPVList::GetPropList() -{ - return m_pPropList; -} - /** * @brief Double Linked Virtual List Head Tail */ @@ -175,17 +145,9 @@ private: LwpObjectID m_ListHead; LwpObjectID m_ListTail; public: - inline LwpObjectID* GetHead(); - inline LwpObjectID* GetTail(); + LwpObjectID* GetHead() { return &m_ListHead; } + LwpObjectID* GetTail() { return &m_ListTail; } }; -LwpObjectID* LwpDLVListHeadTail::GetHead() -{ - return &m_ListHead; -} -LwpObjectID* LwpDLVListHeadTail::GetTail() -{ - return &m_ListTail; -} /** * @brief Double Linked Virtual List Head @@ -196,14 +158,10 @@ public: LwpDLVListHead(){} ~LwpDLVListHead(){} void Read(LwpObjectStream* pObjStrm); - inline LwpObjectID* GetFirst(); + LwpObjectID* GetFirst() { return &m_objHead; } protected: LwpObjectID m_objHead;//LwpDLVList }; -LwpObjectID* LwpDLVListHead::GetFirst() -{ - return &m_objHead; -} #endif diff --git a/lotuswordpro/source/filter/lwpdropcapmgr.cxx b/lotuswordpro/source/filter/lwpdropcapmgr.cxx index ee8398521fac..3772954aa46f 100644 --- a/lotuswordpro/source/filter/lwpdropcapmgr.cxx +++ b/lotuswordpro/source/filter/lwpdropcapmgr.cxx @@ -77,8 +77,4 @@ void LwpDropcapMgr::SetXFPara(XFParagraph* pXFPara) m_pXFPara = pXFPara; } -XFParagraph* LwpDropcapMgr::GetXFPara() -{ - return m_pXFPara; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpdropcapmgr.hxx b/lotuswordpro/source/filter/lwpdropcapmgr.hxx index a8a53d43b039..620ad35e934d 100644 --- a/lotuswordpro/source/filter/lwpdropcapmgr.hxx +++ b/lotuswordpro/source/filter/lwpdropcapmgr.hxx @@ -73,7 +73,7 @@ public: LwpDropcapMgr(); ~LwpDropcapMgr(); void SetXFPara(XFParagraph* pXFPara); - XFParagraph* GetXFPara(); + XFParagraph* GetXFPara() { return m_pXFPara;} private: XFParagraph* m_pXFPara; }; diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx index 800b6a411c12..9bf661bed57e 100644 --- a/lotuswordpro/source/filter/lwplayout.cxx +++ b/lotuswordpro/source/filter/lwplayout.cxx @@ -2123,14 +2123,6 @@ bool LwpPlacableLayout::IsAnchorCell() } /** -* @descr: Get font style for setting position of frame -* -*/ -rtl::Reference<XFFont> LwpPlacableLayout::GetFont() -{ - return m_pFont; -} -/** * @descr: Set font style for setting position of frame * */ diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx index 525e9dde8bd8..1b2c9aacb06a 100644 --- a/lotuswordpro/source/filter/lwplayout.hxx +++ b/lotuswordpro/source/filter/lwplayout.hxx @@ -410,7 +410,11 @@ public: virtual bool IsAnchorFrame() SAL_OVERRIDE; virtual bool IsAnchorCell() SAL_OVERRIDE; virtual void XFConvertFrame(XFContentContainer* /*pCont*/, sal_Int32 /*nStart*/ = 0, sal_Int32 /*nEnd*/ = 0, bool /*bAll*/ = false) {} - rtl::Reference<XFFont> GetFont(); + /** + * @descr: Get font style for setting position of frame + * + */ + rtl::Reference<XFFont> GetFont() { return m_pFont; } void SetFont(rtl::Reference<XFFont> const & pFont); enum WrapType { diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx index 07dab82a0d8e..152171c9805c 100644 --- a/lotuswordpro/source/filter/lwpparastyle.cxx +++ b/lotuswordpro/source/filter/lwpparastyle.cxx @@ -759,10 +759,6 @@ LwpBreaksOverride* LwpParaStyle::GetBreaks() const return NULL; } -LwpBulletOverride* LwpParaStyle::GetBulletOverride() const -{ - return m_pBulletOverride; -} LwpNumberingOverride* LwpParaStyle::GetNumberingOverride() const { diff --git a/lotuswordpro/source/filter/lwpparastyle.hxx b/lotuswordpro/source/filter/lwpparastyle.hxx index 78f2a5bc4435..6a394f4e9bf4 100644 --- a/lotuswordpro/source/filter/lwpparastyle.hxx +++ b/lotuswordpro/source/filter/lwpparastyle.hxx @@ -103,7 +103,7 @@ public: LwpParaBorderOverride* GetParaBorder() const; LwpBreaksOverride* GetBreaks() const; LwpTabOverride* GetTabOverride() const; - LwpBulletOverride* GetBulletOverride() const; + LwpBulletOverride* GetBulletOverride() const { return m_pBulletOverride;} LwpNumberingOverride* GetNumberingOverride() const; public: static void ApplySubBorder(LwpBorderStuff* pBorderStuff, LwpBorderStuff::BorderType eType, XFBorders* pXFBorders); diff --git a/lotuswordpro/source/filter/lwpsdwrect.cxx b/lotuswordpro/source/filter/lwpsdwrect.cxx index 189ae3109b7c..884296e72c07 100644 --- a/lotuswordpro/source/filter/lwpsdwrect.cxx +++ b/lotuswordpro/source/filter/lwpsdwrect.cxx @@ -116,15 +116,6 @@ SdwRectangle::~SdwRectangle() } /************************************************************************** * @date: 11/19/2004 - * @short: Get the flag whether if the rectangle has been rotated. - * @return: m_bRotated rotation flag. -**************************************************************************/ -bool SdwRectangle::IsRectRotated() const -{ - return m_bRotated; -} -/************************************************************************** - * @date: 11/19/2004 * @short: Calculate and return center point of the rectangle. * @return: center point **************************************************************************/ diff --git a/lotuswordpro/source/filter/lwpsdwrect.hxx b/lotuswordpro/source/filter/lwpsdwrect.hxx index 846c1b9c7c4b..dbcd37d0e4d3 100644 --- a/lotuswordpro/source/filter/lwpsdwrect.hxx +++ b/lotuswordpro/source/filter/lwpsdwrect.hxx @@ -108,7 +108,11 @@ public: ~SdwRectangle(); public: - bool IsRectRotated() const; + /* + * @short: Get the flag whether if the rectangle has been rotated. + * @return: m_bRotated rotation flag. + */ + bool IsRectRotated() const { return m_bRotated;} Point GetRectCenter() const ; diff --git a/lotuswordpro/source/filter/lwpstory.hxx b/lotuswordpro/source/filter/lwpstory.hxx index f096e7d8c999..a1777240f850 100644 --- a/lotuswordpro/source/filter/lwpstory.hxx +++ b/lotuswordpro/source/filter/lwpstory.hxx @@ -112,13 +112,13 @@ public: XFContentContainer* GetXFContent(); void AddXFContent(XFContent* pContent); - inline bool GetDropcapFlag(); - inline LwpPageLayout* GetCurrentLayout(); + bool GetDropcapFlag() { return m_bDropcap; } + LwpPageLayout* GetCurrentLayout() { return m_pCurrentLayout; } inline LwpMiddleLayout* GetTabLayout();//for register tab style - inline OUString GetSectionName(); - inline LwpHyperlinkMgr* GetHyperlinkMgr(); + OUString GetSectionName() { return m_CurrSectionName; } + LwpHyperlinkMgr* GetHyperlinkMgr() { return m_pHyperlinkMgr; } - inline bool IsPMModified(); + inline bool IsPMModified() { return m_bPMModified; } inline void SetPMModified(bool bPMModified); inline void SetDropcapFlag(bool bFlag); inline void SetTabLayout(LwpLayout* pLayout); @@ -151,10 +151,6 @@ LwpObjectID* LwpStory::GetLastPara() { return m_ParaList.GetTail(); } -bool LwpStory::GetDropcapFlag() -{ - return m_bDropcap; -} LwpMiddleLayout* LwpStory::GetTabLayout() { if(m_pTabLayout) @@ -177,22 +173,6 @@ void LwpStory::SetSectionName(const OUString& StyleName) { m_CurrSectionName = StyleName; } -OUString LwpStory::GetSectionName() -{ - return m_CurrSectionName; -} -bool LwpStory::IsPMModified() -{ - return m_bPMModified; -} -LwpPageLayout* LwpStory::GetCurrentLayout() -{ - return m_pCurrentLayout; -} -LwpHyperlinkMgr* LwpStory::GetHyperlinkMgr() -{ - return m_pHyperlinkMgr; -} inline void LwpStory::AddBullStyleName2List(const OUString& rStyleName, const sal_uInt8& nPos) { m_vBulletStyleNameList.push_back(std::make_pair(rStyleName, nPos)); diff --git a/lotuswordpro/source/filter/xfilter/xffontdecl.cxx b/lotuswordpro/source/filter/xfilter/xffontdecl.cxx index 4b5115d1da85..691a37583421 100644 --- a/lotuswordpro/source/filter/xfilter/xffontdecl.cxx +++ b/lotuswordpro/source/filter/xfilter/xffontdecl.cxx @@ -76,9 +76,5 @@ OUString XFFontDecl::GetFontFamily() return m_strFontFamily; } -bool XFFontDecl::GetFontPitchFixed() -{ - return m_bPitchFixed; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xffontdecl.hxx b/lotuswordpro/source/filter/xfilter/xffontdecl.hxx index eb69e138e8de..b540b93dfd2b 100644 --- a/lotuswordpro/source/filter/xfilter/xffontdecl.hxx +++ b/lotuswordpro/source/filter/xfilter/xffontdecl.hxx @@ -84,7 +84,7 @@ public: */ OUString GetFontFamily(); - bool GetFontPitchFixed(); + bool GetFontPitchFixed() { return m_bPitchFixed;} private: OUString m_strFontName; |