diff options
author | Jan Holesovsky <kendy@collabora.com> | 2015-11-16 10:55:38 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2015-11-16 11:48:10 +0100 |
commit | f5c11ad18106f100b0fa3fc215540a037fb5d338 (patch) | |
tree | 965a3068d9716e338bda2ed83a1fcab4ee538054 | |
parent | 6329a3036e7df33d962d0164b5689862ae4498b7 (diff) |
sw: Prefix a member in SwVirtFlyDrawObj.
Change-Id: I5514bf16446fa4e4c498a6bc1df77e4f59565ee1
-rw-r--r-- | sw/source/core/draw/dflyobj.cxx | 24 | ||||
-rw-r--r-- | sw/source/core/inc/dflyobj.hxx | 6 |
2 files changed, 15 insertions, 15 deletions
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index 3b9cf03713c0..d03ca0121f32 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -374,9 +374,9 @@ sdr::contact::ViewContact* SwVirtFlyDrawObj::CreateObjectSpecificViewContact() SwVirtFlyDrawObj::SwVirtFlyDrawObj(SdrObject& rNew, SwFlyFrm* pFly) : SdrVirtObj( rNew ), - pFlyFrm( pFly ) + m_pFlyFrm( pFly ) { - const SvxProtectItem &rP = pFlyFrm->GetFormat()->GetProtect(); + const SvxProtectItem &rP = m_pFlyFrm->GetFormat()->GetProtect(); bMovProt = rP.IsPosProtected(); bSizProt = rP.IsSizeProtected(); } @@ -444,7 +444,7 @@ namespace void SwVirtFlyDrawObj::wrap_DoPaintObject( drawinglayer::geometry::ViewInformation2D const& rViewInformation) const { - SwViewShell* pShell = pFlyFrm->getRootFrm()->GetCurrShell(); + SwViewShell* pShell = m_pFlyFrm->getRootFrm()->GetCurrShell(); // Only paint when we have a current shell and a DrawingLayer paint is in progress. // This avoids evtl. problems with renderers which do processing stuff, @@ -466,7 +466,7 @@ void SwVirtFlyDrawObj::wrap_DoPaintObject( // which is slow, wastes memory, and can cause other trouble. (void) rViewInformation; // suppress "unused parameter" warning assert(comphelper::LibreOfficeKit::isActive() || !rViewInformation.getViewport().isEmpty()); - if ( !pFlyFrm->IsFlyInCntFrm() ) + if ( !m_pFlyFrm->IsFlyInCntFrm() ) { // it is also necessary to restore the VCL MapMode from ViewInformation since e.g. // the VCL PixelRenderer resets it at the used OutputDevice. Unfortunately, this @@ -477,7 +477,7 @@ void SwVirtFlyDrawObj::wrap_DoPaintObject( RestoreMapMode aRestoreMapModeIfNeeded( pShell ); // paint the FlyFrame (use standard VCL-Paint) - pFlyFrm->Paint( *pShell->GetOut(), GetFlyFrm()->Frm() ); + m_pFlyFrm->Paint( *pShell->GetOut(), GetFlyFrm()->Frm() ); } } } @@ -961,23 +961,23 @@ Pointer SwVirtFlyDrawObj::GetMacroPointer( bool SwVirtFlyDrawObj::HasMacro() const { - const SwFormatURL &rURL = pFlyFrm->GetFormat()->GetURL(); + const SwFormatURL &rURL = m_pFlyFrm->GetFormat()->GetURL(); return rURL.GetMap() || !rURL.GetURL().isEmpty(); } SdrObject* SwVirtFlyDrawObj::CheckMacroHit( const SdrObjMacroHitRec& rRec ) const { - const SwFormatURL &rURL = pFlyFrm->GetFormat()->GetURL(); + const SwFormatURL &rURL = m_pFlyFrm->GetFormat()->GetURL(); if( rURL.GetMap() || !rURL.GetURL().isEmpty() ) { SwRect aRect; - if ( pFlyFrm->Lower() && pFlyFrm->Lower()->IsNoTextFrm() ) + if ( m_pFlyFrm->Lower() && m_pFlyFrm->Lower()->IsNoTextFrm() ) { - aRect = pFlyFrm->Prt(); - aRect += pFlyFrm->Frm().Pos(); + aRect = m_pFlyFrm->Prt(); + aRect += m_pFlyFrm->Frm().Pos(); } else - aRect = pFlyFrm->Frm(); + aRect = m_pFlyFrm->Frm(); if( aRect.IsInside( rRec.aPos ) ) { @@ -989,7 +989,7 @@ SdrObject* SwVirtFlyDrawObj::CheckMacroHit( const SdrObjMacroHitRec& rRec ) cons if( aRect.IsInside( rRec.aPos ) ) { if( !rURL.GetMap() || - pFlyFrm->GetFormat()->GetIMapObject( rRec.aPos, pFlyFrm )) + m_pFlyFrm->GetFormat()->GetIMapObject( rRec.aPos, m_pFlyFrm )) return const_cast<SdrObject*>(static_cast<SdrObject const *>(this)); return nullptr; diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx index c21fa1ad1d23..40eba1957acb 100644 --- a/sw/source/core/inc/dflyobj.hxx +++ b/sw/source/core/inc/dflyobj.hxx @@ -60,7 +60,7 @@ public: class SwVirtFlyDrawObj : public SdrVirtObj { private: - SwFlyFrm *pFlyFrm; + SwFlyFrm *m_pFlyFrm; protected: // AW: Need own sdr::contact::ViewContact since AnchorPos from parent is @@ -110,8 +110,8 @@ public: SwFrameFormat *GetFormat(); // methods to get pointers for the Fly - SwFlyFrm* GetFlyFrm() { return pFlyFrm; } - const SwFlyFrm* GetFlyFrm() const { return pFlyFrm; } + SwFlyFrm* GetFlyFrm() { return m_pFlyFrm; } + const SwFlyFrm* GetFlyFrm() const { return m_pFlyFrm; } void SetRect() const; |