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 /sw | |
| 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 'sw')
| -rw-r--r-- | sw/source/core/draw/dpage.cxx | 6 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/edtwin.cxx | 6 | ||||
| -rw-r--r-- | sw/source/uibase/ribbar/drawbase.cxx | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx index 11b040425bf0..13e08682b23e 100644 --- a/sw/source/core/draw/dpage.cxx +++ b/sw/source/core/draw/dpage.cxx @@ -205,10 +205,10 @@ bool SwDPage::RequestHelp( vcl::Window* pWindow, SdrView const * pView, MouseEvent aMEvt(pWindow->ScreenToOutputPixel(rEvt.GetMousePosPixel()), 1, MouseEventModifiers::NONE, MOUSE_LEFT); pView->PickAnything(aMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt); - if (aVEvt.eEvent == SdrEventKind::ExecuteUrl) + if (aVEvt.meEvent == SdrEventKind::ExecuteUrl) { - sText = aVEvt.pURLField->GetURL(); - aPixRect = pWindow->LogicToPixel(aVEvt.pObj->GetLogicRect()); + sText = aVEvt.mpURLField->GetURL(); + aPixRect = pWindow->LogicToPixel(aVEvt.mpObj->GetLogicRect()); } } diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 446d2faa5405..d93c1f08178c 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -3165,7 +3165,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) SdrViewEvent aVEvt; pSdrView->PickAnything(aMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt); - if (aVEvt.eEvent == SdrEventKind::ExecuteUrl) + if (aVEvt.meEvent == SdrEventKind::ExecuteUrl) bExecDrawTextLink = true; } } @@ -4810,10 +4810,10 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt) if (pSdrView) pSdrView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt); - if (pSdrView && aVEvt.eEvent == SdrEventKind::ExecuteUrl) + if (pSdrView && aVEvt.meEvent == SdrEventKind::ExecuteUrl) { // hit URL field - const SvxURLField *pField = aVEvt.pURLField; + const SvxURLField *pField = aVEvt.mpURLField; if (pField) { const OUString& sURL(pField->GetURL()); diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx index e3f6e07538c6..e7c176e72bc7 100644 --- a/sw/source/uibase/ribbar/drawbase.cxx +++ b/sw/source/uibase/ribbar/drawbase.cxx @@ -107,11 +107,11 @@ bool SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt) m_aStartPos = m_pWin->PixelToLogic(rMEvt.GetPosPixel()); sal_uInt16 nEditMode = m_pWin->GetBezierMode(); - if (eHit == SdrHitKind::Handle && aVEvt.pHdl->GetKind() == SdrHdlKind::BezierWeight) + if (eHit == SdrHitKind::Handle && aVEvt.mpHdl->GetKind() == SdrHdlKind::BezierWeight) { // Drag handle g_bNoInterrupt = true; - bReturn = pSdrView->BegDragObj(m_aStartPos, nullptr, aVEvt.pHdl); + bReturn = pSdrView->BegDragObj(m_aStartPos, nullptr, aVEvt.mpHdl); m_pWin->SetDrawAction(true); } else if (eHit == SdrHitKind::MarkedObject && nEditMode == SID_BEZIER_INSERT) @@ -138,7 +138,7 @@ bool SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt) else if (eHit == SdrHitKind::Handle) { // Select gluepoint - if (pSdrView->HasMarkablePoints() && (!pSdrView->IsPointMarked(*aVEvt.pHdl) || rMEvt.IsShift())) + if (pSdrView->HasMarkablePoints() && (!pSdrView->IsPointMarked(*aVEvt.mpHdl) || rMEvt.IsShift())) { SdrHdl* pHdl = nullptr; @@ -149,9 +149,9 @@ bool SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt) } else { - if (pSdrView->IsPointMarked(*aVEvt.pHdl)) + if (pSdrView->IsPointMarked(*aVEvt.mpHdl)) { - bReturn = pSdrView->UnmarkPoint(*aVEvt.pHdl); + bReturn = pSdrView->UnmarkPoint(*aVEvt.mpHdl); pHdl = nullptr; } else |