diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2016-12-19 05:44:57 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2016-12-23 07:45:42 +0000 |
| commit | 2fc262d3a7bf3be8d318b3f194ccab2a301ade8c (patch) | |
| tree | b2d180bcfe30257f28725496553c16c6cc6371e1 /sw | |
| parent | 16fa8b0bca0c07f676c5acad50504ed339da6bc1 (diff) | |
GetDrawContact() isnt called anymore
Change-Id: Ib054f883d86ff2e68c118972abd6e3d0f12b181c
Reviewed-on: https://gerrit.libreoffice.org/32151
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/text/porfly.cxx | 6 | ||||
| -rw-r--r-- | sw/source/core/text/porfly.hxx | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx index a0ee4b9c12dc..0e211ec355e6 100644 --- a/sw/source/core/text/porfly.cxx +++ b/sw/source/core/text/porfly.cxx @@ -308,18 +308,18 @@ SdrObject* sw::DrawFlyCntPortion::GetSdrObj(const SwTextFrame& rFrame) { SdrObject* pSdrObj; // Determine drawing object ('master' or 'virtual') by frame - pSdrObj = GetDrawContact()->GetDrawObjectByAnchorFrame(rFrame); + pSdrObj = m_pContact->GetDrawObjectByAnchorFrame(rFrame); if(!pSdrObj) { SAL_WARN("sw.core", "SwFlyCntPortion::SetBase(..) - No drawing object found by <GetDrawContact()->GetDrawObjectByAnchorFrame( rFrame )>"); - pSdrObj = GetDrawContact()->GetMaster(); + pSdrObj = m_pContact->GetMaster(); } // Call <SwAnchoredDrawObject::MakeObjPos()> to assure that flag at // the <DrawFrameFormat> and at the <SwAnchoredDrawObject> instance are // correctly set if(pSdrObj) - GetDrawContact()->GetAnchoredObj(pSdrObj)->MakeObjPos(); + m_pContact->GetAnchoredObj(pSdrObj)->MakeObjPos(); return pSdrObj; } diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx index fdedd26d7123..7e173f98969e 100644 --- a/sw/source/core/text/porfly.hxx +++ b/sw/source/core/text/porfly.hxx @@ -87,8 +87,6 @@ namespace sw public: DrawFlyCntPortion(SwDrawContact* pDrawContact); static DrawFlyCntPortion* Create(const SwTextFrame& rFrame, SwDrawContact* pDrawContact, const Point& rBase, long nAsc, long nDescent, long nFlyAsc, long nFlyDesc, AsCharFlags nFlags); - inline SwDrawContact* GetDrawContact() { return m_pContact; } - inline const SwDrawContact* GetDrawContact() const { return m_pContact; } virtual void Paint(const SwTextPaintInfo& rInf) const override; virtual ~DrawFlyCntPortion() override; }; |