summaryrefslogtreecommitdiff
path: root/sw/source/core/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-10-25 15:53:44 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-10-27 06:08:51 +0000
commita7ea18ffe715776cb0e2b39e98569c75605ee332 (patch)
tree1e32da87f2ad0e8d111ba8ed99180bb6b4cf2a77 /sw/source/core/inc
parenteca5ea9f79181d45cd7fbabe2313617d3025818a (diff)
loplugin:expandablemethods in sw
Change-Id: Ibc9edc28f4041235ab30c026bd3774bd74b7e960 Reviewed-on: https://gerrit.libreoffice.org/30287 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/core/inc')
-rw-r--r--sw/source/core/inc/anchoredobjectposition.hxx4
-rw-r--r--sw/source/core/inc/cntfrm.hxx6
-rw-r--r--sw/source/core/inc/flyfrm.hxx1
-rw-r--r--sw/source/core/inc/frmtool.hxx5
-rw-r--r--sw/source/core/inc/swfont.hxx9
-rw-r--r--sw/source/core/inc/threadmanager.hxx5
6 files changed, 2 insertions, 28 deletions
diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx
index f4fc3b72a314..afe6717c3de4 100644
--- a/sw/source/core/inc/anchoredobjectposition.hxx
+++ b/sw/source/core/inc/anchoredobjectposition.hxx
@@ -100,10 +100,6 @@ namespace objectpositioning
{
return *mpAnchorFrame;
}
- inline SwContact& GetContact() const
- {
- return *mpContact;
- }
inline const SwFrameFormat& GetFrameFormat() const
{
return *mpFrameFormat;
diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx
index ea2dba49861e..5826ca4ff9b9 100644
--- a/sw/source/core/inc/cntfrm.hxx
+++ b/sw/source/core/inc/cntfrm.hxx
@@ -76,7 +76,6 @@ public:
inline const SwContentFrame *GetFollow() const;
inline SwContentFrame *GetFollow();
- inline const SwContentFrame *GetPrecede() const;
SwTextFrame* FindMaster() const;
// layout dependent cursor travelling
@@ -134,11 +133,6 @@ inline SwContentFrame *SwContentFrame::GetFollow()
return static_cast<SwContentFrame*>(SwFlowFrame::GetFollow());
}
-inline const SwContentFrame *SwContentFrame::GetPrecede() const
-{
- return static_cast<const SwContentFrame*>(SwFlowFrame::GetPrecede());
-}
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index d207bb0f6f43..37b6ba8f7950 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -125,7 +125,6 @@ protected:
void Unlock() { m_bLocked = false; }
Size CalcRel( const SwFormatFrameSize &rSz ) const;
- SwTwips CalcAutoWidth() const;
SwFlyFrame( SwFlyFrameFormat*, SwFrame*, SwFrame *pAnchor );
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index 6885a6b9bbd3..168ed121dfe9 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -192,8 +192,6 @@ class SwLayNotify : public SwFrameNotify
{
bool bLowersComplete;
- SwLayoutFrame *GetLay() { return static_cast<SwLayoutFrame*>(mpFrame); }
-
public:
SwLayNotify( SwLayoutFrame *pLayFrame );
~SwLayNotify();
@@ -206,7 +204,6 @@ class SwFlyNotify : public SwLayNotify
{
SwPageFrame *pOldPage;
const SwRect aFrameAndSpace;
- SwFlyFrame *GetFly() { return static_cast<SwFlyFrame*>(mpFrame); }
public:
SwFlyNotify( SwFlyFrame *pFlyFrame );
@@ -224,8 +221,6 @@ private:
bool mbInvalidatePrevPrtArea;
bool mbBordersJoinedWithPrev;
- SwContentFrame *GetCnt();
-
public:
SwContentNotify( SwContentFrame *pContentFrame );
~SwContentNotify();
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 857719bf9863..fd41e411aca9 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -993,13 +993,8 @@ public:
sal_uInt16 nDrawStretchText;
sal_uInt16 nChangeFont;
- inline void Reset()
- {
- nGetTextSize = nDrawText = nGetStretchTextSize =
- nDrawStretchText = nChangeFont = 0;
- }
-
- inline SvStatistics() { Reset(); }
+ SvStatistics()
+ { nGetTextSize = nDrawText = nGetStretchTextSize = nDrawStretchText = nChangeFont = 0; }
};
// global variable, implemented in swfont.cxx
diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx
index 126973bb58be..83ea7bae6b6d 100644
--- a/sw/source/core/inc/threadmanager.hxx
+++ b/sw/source/core/inc/threadmanager.hxx
@@ -139,11 +139,6 @@ class ThreadManager
}
};
- inline oslInterlockedCount RetrieveNewThreadID()
- {
- return osl_atomic_increment( &mnThreadIDCounter );
- }
-
bool StartWaitingThread();
bool StartThread( const tThreadData& aThreadData );