summaryrefslogtreecommitdiff
path: root/lotuswordpro
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-03-03 20:57:02 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-03-03 20:55:50 +0000
commit6cb9e6dad798ec59f055aebe84a9c4a21e4be40d (patch)
tree21a7d6c0b165251ba8e0f36e73c851d41ac9dd04 /lotuswordpro
parent7e8806cd728bf906e1a8f1d649bef7337f297b1c (diff)
Remove redundant 'inline' keyword
...from function definitions occurring within class definitions. Done with a rewriting Clang plugin (to be pushed later). Change-Id: I9c6f2818a57ccdb361548895a7743107cbacdff8 Reviewed-on: https://gerrit.libreoffice.org/34874 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'lotuswordpro')
-rw-r--r--lotuswordpro/source/filter/lwpbackgroundstuff.hxx4
-rw-r--r--lotuswordpro/source/filter/lwpdrawobj.hxx2
-rw-r--r--lotuswordpro/source/filter/lwpfont.hxx4
-rw-r--r--lotuswordpro/source/filter/lwpfoundry.hxx20
-rw-r--r--lotuswordpro/source/filter/lwplayout.hxx2
-rw-r--r--lotuswordpro/source/filter/lwplaypiece.hxx10
-rw-r--r--lotuswordpro/source/filter/lwprowlayout.hxx2
-rw-r--r--lotuswordpro/source/filter/lwpstory.hxx2
-rw-r--r--lotuswordpro/source/filter/lwptoc.hxx8
9 files changed, 27 insertions, 27 deletions
diff --git a/lotuswordpro/source/filter/lwpbackgroundstuff.hxx b/lotuswordpro/source/filter/lwpbackgroundstuff.hxx
index c31f142ca3c2..29fd54a41c17 100644
--- a/lotuswordpro/source/filter/lwpbackgroundstuff.hxx
+++ b/lotuswordpro/source/filter/lwpbackgroundstuff.hxx
@@ -152,8 +152,8 @@ public:
LwpColor* GetFillColor();
XFBGImage* GetFillPattern();
- inline bool IsTransparent() { return (m_nID == BACK_TRANSPARENT); }
- inline bool IsPatternFill() { return (m_nID > 2 && m_nID < 72); }
+ bool IsTransparent() { return (m_nID == BACK_TRANSPARENT); }
+ bool IsPatternFill() { return (m_nID > 2 && m_nID < 72); }
friend class LwpBackgroundOverride;
private:
diff --git a/lotuswordpro/source/filter/lwpdrawobj.hxx b/lotuswordpro/source/filter/lwpdrawobj.hxx
index fe6b61a70b4f..8c41bec29753 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.hxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.hxx
@@ -138,7 +138,7 @@ public:
* @param type of the object.
* @descr set the type to the draw object.
*/
- inline void SetObjectType(DrawObjectType eType) { m_eType = eType; }
+ void SetObjectType(DrawObjectType eType) { m_eType = eType; }
};
/**
diff --git a/lotuswordpro/source/filter/lwpfont.hxx b/lotuswordpro/source/filter/lwpfont.hxx
index 6928df392b42..b0297fbbade7 100644
--- a/lotuswordpro/source/filter/lwpfont.hxx
+++ b/lotuswordpro/source/filter/lwpfont.hxx
@@ -116,8 +116,8 @@ public:
{}
public:
void Read(LwpObjectStream *pStrm);
- inline sal_uInt16 GetFaceID(){return m_nFaceName;}
- inline sal_uInt16 GetAltFaceID(){return m_nAltFaceName;}
+ sal_uInt16 GetFaceID(){return m_nFaceName;}
+ sal_uInt16 GetAltFaceID(){return m_nAltFaceName;}
void Override(rtl::Reference<XFFont> const & pFont);
inline bool IsFaceNameOverridden();
inline bool IsAltFaceNameOverridden();
diff --git a/lotuswordpro/source/filter/lwpfoundry.hxx b/lotuswordpro/source/filter/lwpfoundry.hxx
index 2f2ac1d96466..2009e11d90f5 100644
--- a/lotuswordpro/source/filter/lwpfoundry.hxx
+++ b/lotuswordpro/source/filter/lwpfoundry.hxx
@@ -132,8 +132,8 @@ private:
LwpObjectID m_OleHead;
LwpObjectID m_OleTail;
public:
- inline LwpObjectID& GetContentList() { return m_ContentList; }
- inline LwpObjectID& GetGraphicListHead() { return m_GrapHead; }
+ LwpObjectID& GetContentList() { return m_ContentList; }
+ LwpObjectID& GetGraphicListHead() { return m_GrapHead; }
LwpContent* EnumContents(LwpContent* pContent);
public:
@@ -249,14 +249,14 @@ private: //file members
private:
void ReadStyles(LwpObjectStream *pStrm);
public:
- inline LwpContentManager& GetContentManager() { return m_ContentMgr; }
- inline LwpObjectID& GetGraphicListHead() { return m_ContentMgr.GetGraphicListHead(); }
- inline LwpFontManager& GetFontManger() { return m_FontMgr;}
- inline LwpObjectID& GetTextStyleHead() { return m_TextStyle;}
- inline LwpObjectID& GetLayout() {return m_Layout;}
- inline LwpObjectID& GetBulletManagerID() { return m_BulMgr.GetHeadID();}
- inline LwpDocument* GetDocument(){ return m_pDoc;}
- inline LwpNumberManager& GetNumberManager() { return m_NumMgr;}
+ LwpContentManager& GetContentManager() { return m_ContentMgr; }
+ LwpObjectID& GetGraphicListHead() { return m_ContentMgr.GetGraphicListHead(); }
+ LwpFontManager& GetFontManger() { return m_FontMgr;}
+ LwpObjectID& GetTextStyleHead() { return m_TextStyle;}
+ LwpObjectID& GetLayout() {return m_Layout;}
+ LwpObjectID& GetBulletManagerID() { return m_BulMgr.GetHeadID();}
+ LwpDocument* GetDocument(){ return m_pDoc;}
+ LwpNumberManager& GetNumberManager() { return m_NumMgr;}
LwpObjectID * GetDefaultTextStyle() ;
private:
std::unique_ptr<LwpStyleManager> m_xStyleMgr;
diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx
index c780067fb365..5940afa8cda9 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -97,7 +97,7 @@ class LwpVirtualLayout : public LwpDLNFPVList
{
public:
LwpVirtualLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
- inline virtual sal_uInt16 GetNumCols(){return 1;}
+ virtual sal_uInt16 GetNumCols(){return 1;}
virtual double GetColWidth(sal_uInt16 nIndex);
virtual double GetColGap(sal_uInt16 nIndex);
virtual bool IsAutoGrow(){ return false;}
diff --git a/lotuswordpro/source/filter/lwplaypiece.hxx b/lotuswordpro/source/filter/lwplaypiece.hxx
index 0eb7f40b17b3..86b62a6a2624 100644
--- a/lotuswordpro/source/filter/lwplaypiece.hxx
+++ b/lotuswordpro/source/filter/lwplaypiece.hxx
@@ -116,7 +116,7 @@ public:
sal_Int32 GetScaleWidth(){return m_nScaleWidth;}
sal_Int32 GetScaleHeight(){return m_nScaleHeight;}
sal_uInt16 GetPlacement(){return m_nPlacement;}
- inline LwpPoint& GetOffset() {return m_Offset;}
+ LwpPoint& GetOffset() {return m_Offset;}
protected:
virtual void Read() override;
protected:
@@ -209,8 +209,8 @@ public:
LwpColumnInfo();
~LwpColumnInfo();
void Read(LwpObjectStream *pStrm);
- inline double GetWidth(){return LwpTools::ConvertFromUnitsToMetric(m_nWidth);}
- inline double GetGap(){return LwpTools::ConvertFromUnitsToMetric(m_nGap);}
+ double GetWidth(){return LwpTools::ConvertFromUnitsToMetric(m_nWidth);}
+ double GetGap(){return LwpTools::ConvertFromUnitsToMetric(m_nGap);}
private:
sal_Int32 m_nWidth;
sal_Int32 m_nGap;
@@ -221,7 +221,7 @@ class LwpLayoutColumns : public LwpVirtualPiece
public:
LwpLayoutColumns(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
virtual void Parse(IXFStream* pOutputStream) override;
- inline sal_uInt16 GetNumCols(){return m_nNumCols;}
+ sal_uInt16 GetNumCols(){return m_nNumCols;}
double GetColWidth(sal_uInt16 nIndex);
double GetColGap(sal_uInt16 nIndex);
protected:
@@ -238,7 +238,7 @@ class LwpLayoutGutters : public LwpVirtualPiece
public:
LwpLayoutGutters(LwpObjectHeader& objHdr, LwpSvStream* pStrm);
virtual void Parse(IXFStream* pOutputStream) override;
- inline LwpBorderStuff& GetBorderStuff() { return m_BorderBuffer; }
+ LwpBorderStuff& GetBorderStuff() { return m_BorderBuffer; }
protected:
virtual void Read() override;
protected:
diff --git a/lotuswordpro/source/filter/lwprowlayout.hxx b/lotuswordpro/source/filter/lwprowlayout.hxx
index e34ae8147852..08e79c7abe36 100644
--- a/lotuswordpro/source/filter/lwprowlayout.hxx
+++ b/lotuswordpro/source/filter/lwprowlayout.hxx
@@ -80,7 +80,7 @@ public:
virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_ROW_LAYOUT;}
sal_uInt16 GetRowID() { return crowid;}
virtual void RegisterStyle() override;
- inline LwpTableLayout * GetParentTableLayout(){return dynamic_cast<LwpTableLayout *>(GetParent().obj().get());}
+ LwpTableLayout * GetParentTableLayout(){return dynamic_cast<LwpTableLayout *>(GetParent().obj().get());}
void SetRowMap();
protected:
void Read() override;
diff --git a/lotuswordpro/source/filter/lwpstory.hxx b/lotuswordpro/source/filter/lwpstory.hxx
index f4c421bea964..9168b680b19f 100644
--- a/lotuswordpro/source/filter/lwpstory.hxx
+++ b/lotuswordpro/source/filter/lwpstory.hxx
@@ -114,7 +114,7 @@ public:
const OUString& GetSectionName() { return m_CurrSectionName; }
LwpHyperlinkMgr* GetHyperlinkMgr() { return m_pHyperlinkMgr.get(); }
- inline bool IsPMModified() { return m_bPMModified; }
+ bool IsPMModified() { return m_bPMModified; }
inline void SetPMModified(bool bPMModified);
inline void SetDropcapFlag(bool bFlag);
inline void SetTabLayout(LwpLayout* pLayout);
diff --git a/lotuswordpro/source/filter/lwptoc.hxx b/lotuswordpro/source/filter/lwptoc.hxx
index 1e8a6fb8a934..5c2c2c85191c 100644
--- a/lotuswordpro/source/filter/lwptoc.hxx
+++ b/lotuswordpro/source/filter/lwptoc.hxx
@@ -147,10 +147,10 @@ public:
LwpTocLevelData(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
void RegisterStyle() override;
virtual void XFConvert(XFContentContainer* pCont) override;
- inline sal_uInt16 GetLevel(){return m_nLevel;}
- inline bool GetUseText(){ return (m_nFlags & USETEXT) != 0;}
- inline OUString GetSearchStyle(){return m_SearchName.str();}
- inline bool GetUseLeadingText(){ return (m_nFlags & USENUMBER) != 0;}
+ sal_uInt16 GetLevel(){return m_nLevel;}
+ bool GetUseText(){ return (m_nFlags & USETEXT) != 0;}
+ OUString GetSearchStyle(){return m_SearchName.str();}
+ bool GetUseLeadingText(){ return (m_nFlags & USENUMBER) != 0;}
private:
virtual ~LwpTocLevelData() override;