diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2016-12-19 05:28:44 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2016-12-22 11:19:11 +0000 |
| commit | 404e4f55ab513a17ed5f9e47fc6fb9656bea9f2b (patch) | |
| tree | a5a39dc25b7f0aed66decdcd9e0a7d51d750e720 | |
| parent | 0dfc6f70ab53a773ee05664235d7c8927ab20f2c (diff) | |
inline some trivial functions
Change-Id: I327dbc236db9462b3cb3d24e2c6abca1ef4cddf4
Reviewed-on: https://gerrit.libreoffice.org/32149
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
| -rw-r--r-- | sw/source/core/text/porfly.cxx | 7 | ||||
| -rw-r--r-- | sw/source/core/text/porfly.hxx | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx index 57f77c95e5a7..a0ee4b9c12dc 100644 --- a/sw/source/core/text/porfly.cxx +++ b/sw/source/core/text/porfly.cxx @@ -296,7 +296,6 @@ sw::DrawFlyCntPortion* sw::DrawFlyCntPortion::Create(const SwTextFrame& rFrame, return pNew; } -SwFlyCntPortion::~SwFlyCntPortion() {}; sw::DrawFlyCntPortion::~DrawFlyCntPortion() {}; sw::FlyContentPortion::~FlyContentPortion() {}; @@ -323,6 +322,7 @@ SdrObject* sw::DrawFlyCntPortion::GetSdrObj(const SwTextFrame& rFrame) GetDrawContact()->GetAnchoredObj(pSdrObj)->MakeObjPos(); return pSdrObj; } + /** * After setting the RefPoints, the ascent needs to be recalculated * because it is dependent on RelPos @@ -412,9 +412,4 @@ void SwFlyCntPortion::SetBase( const SwTextFrame& rFrame, const Point &rBase, } } -void sw::FlyContentPortion::GetFlyCursorOfst(Point& rPoint, SwPosition& rPos, SwCursorMoveState* pCMS) const -{ - m_pFly->GetCursorOfst(&rPos, rPoint, pCMS); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx index 382d4ea67eb2..0e3d6fdf7a9f 100644 --- a/sw/source/core/text/porfly.hxx +++ b/sw/source/core/text/porfly.hxx @@ -22,6 +22,7 @@ #include <ascharanchoredobjectposition.hxx> #include "porglue.hxx" +#include "flyfrms.hxx" class SwDrawContact; class SwFlyInContentFrame; @@ -62,7 +63,7 @@ public: virtual bool Format(SwTextFormatInfo& rInf) override; OUTPUT_OPERATOR_OVERRIDE virtual bool IsDraw() const =0; - virtual ~SwFlyCntPortion() override; + virtual ~SwFlyCntPortion() override {}; }; namespace sw @@ -76,7 +77,7 @@ namespace sw static FlyContentPortion* Create(const SwTextFrame& rFrame, SwFlyInContentFrame* pFly, const Point& rBase, long nAscent, long nDescent, long nFlyAsc, long nFlyDesc, AsCharFlags nFlags); inline SwFlyInContentFrame *GetFlyFrame() { return m_pFly; } inline const SwFlyInContentFrame *GetFlyFrame() const { return m_pFly; } - void GetFlyCursorOfst(Point& rPoint, SwPosition& rPos, SwCursorMoveState* pCMS) const; + void GetFlyCursorOfst(Point& rPoint, SwPosition& rPos, SwCursorMoveState* pCMS) const { m_pFly->GetCursorOfst(&rPos, rPoint, pCMS); }; virtual bool IsDraw() const override { return false; } virtual void Paint(const SwTextPaintInfo& rInf) const override; virtual ~FlyContentPortion() override; |