diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2021-06-15 22:38:26 +0900 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2021-06-17 10:44:05 +0200 |
commit | a572acc3dd5c0bd173ff2881b239be98f4b6ecb4 (patch) | |
tree | fce919fc31ba801ba49a5f89e2470fa4861f0945 /reportdesign/source | |
parent | 12da70f88517bf3c053afe1c504bb70bd27573f2 (diff) |
svx: prefix member variables SdrViewEvent SdrView SdrObjGroup
Change-Id: Ic20c9dc7b8109cb095a883f2dfcec3e4f10b2428
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117352
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'reportdesign/source')
-rw-r--r-- | reportdesign/source/ui/report/dlgedfunc.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index 961927174959..1cf3b14b58c4 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -173,8 +173,8 @@ bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt ) // TODO character in shapes // SdrViewEvent aVEvt; // m_rView.PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt); - // if ( aVEvt.pRootObj && aVEvt.pRootObj->ISA(SdrTextObj) ) - // SetInEditMode(static_cast<SdrTextObj *>(aVEvt.pRootObj),rMEvt, sal_False); + // if ( aVEvt.mpRootObj && aVEvt.pRootObj->ISA(SdrTextObj) ) + // SetInEditMode(static_cast<SdrTextObj *>(aVEvt.mpRootObj),rMEvt, sal_False); bHandled = true; } else @@ -196,8 +196,8 @@ bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt ) SdrViewEvent aVEvt; if ( m_rView.PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt) != SdrHitKind::MarkedObject && !rMEvt.IsShift() ) m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(nullptr); - if ( aVEvt.pRootObj ) - m_rView.MarkObj(aVEvt.pRootObj, pPV); + if ( aVEvt.mpRootObj ) + m_rView.MarkObj(aVEvt.mpRootObj, pPV); else m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(nullptr); @@ -476,9 +476,9 @@ bool DlgEdFunc::isOverlapping(const MouseEvent& rMEvt) { SdrViewEvent aVEvt; bool bOverlapping = m_rView.PickAnything(rMEvt, SdrMouseEventKind::BUTTONUP, aVEvt) != SdrHitKind::NONE; - if (bOverlapping && aVEvt.pObj) + if (bOverlapping && aVEvt.mpObj) { - colorizeOverlappedObject(aVEvt.pObj); + colorizeOverlappedObject(aVEvt.mpObj); } else { @@ -596,9 +596,9 @@ bool DlgEdFunc::isRectangleHit(const MouseEvent& rMEvt) } } } - else if ( aVEvt.pObj && (aVEvt.pObj->GetObjIdentifier() != OBJ_CUSTOMSHAPE) && !m_bSelectionMode) + else if (aVEvt.mpObj && (aVEvt.mpObj->GetObjIdentifier() != OBJ_CUSTOMSHAPE) && !m_bSelectionMode) { - colorizeOverlappedObject(aVEvt.pObj); + colorizeOverlappedObject(aVEvt.mpObj); } else bIsSetPoint = false; @@ -721,7 +721,7 @@ bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt ) SdrPageView* pPV = m_rView.GetSdrPageView(); SdrViewEvent aVEvt; m_rView.PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt); - m_rView.MarkObj(aVEvt.pRootObj, pPV); + m_rView.MarkObj(aVEvt.mpRootObj, pPV); } checkTwoClicks(rMEvt); m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->UpdatePropertyBrowserDelayed(m_rView); @@ -812,7 +812,7 @@ bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt ) } else { - m_rView.SdrBeginTextEdit( aVEvt.pRootObj,m_rView.GetSdrPageView(),m_pParent ); + m_rView.SdrBeginTextEdit( aVEvt.mpRootObj,m_rView.GetSdrPageView(),m_pParent ); } } |