include/svx/svdhdl.hxx | 6 +++--- svx/source/svdraw/svdhdl.cxx | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit 3e3dd080fe32811b4a74088d3e819f593cbebd3e Author: Miklos Vajna <vmik...@collabora.com> AuthorDate: Mon Oct 9 08:05:35 2023 +0200 Commit: Miklos Vajna <vmik...@collabora.com> CommitDate: Mon Oct 9 09:47:18 2023 +0200 svx: prefix members of SdrHdlLine See tdf#94879 for motivation. Change-Id: I08a0368a6e262982419b3866defd6a181675af0e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157690 Reviewed-by: Miklos Vajna <vmik...@collabora.com> Tested-by: Jenkins diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 115bf9c77896..0bcff5f2e318 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -342,11 +342,11 @@ class SdrHdlLine final : public SdrHdl // create marker for this kind virtual void CreateB2dIAObject() override; - SdrHdl* pHdl1; - SdrHdl* pHdl2; + SdrHdl* m_pHdl1; + SdrHdl* m_pHdl2; public: - SdrHdlLine(SdrHdl& rHdl1, SdrHdl& rHdl2, SdrHdlKind eNewKind) { m_eKind=eNewKind; pHdl1=&rHdl1; pHdl2=&rHdl2; } + SdrHdlLine(SdrHdl& rHdl1, SdrHdl& rHdl2, SdrHdlKind eNewKind) { m_eKind=eNewKind; m_pHdl1=&rHdl1; m_pHdl2=&rHdl2; } virtual ~SdrHdlLine() override; virtual PointerStyle GetPointer() const override; diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index cecefc0d7810..deb8da05d9d5 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -1447,7 +1447,7 @@ void SdrHdlLine::CreateB2dIAObject() SdrMarkView* pView = m_pHdlList->GetView(); - if(!(pView && !pView->areMarkHandlesHidden() && pHdl1 && pHdl2)) + if(!(pView && !pView->areMarkHandlesHidden() && m_pHdl1 && m_pHdl2)) return; SdrPageView* pPageView = pView->GetSdrPageView(); @@ -1464,8 +1464,8 @@ void SdrHdlLine::CreateB2dIAObject() const rtl::Reference< sdr::overlay::OverlayManager >& xManager = rPageWindow.GetOverlayManager(); if (xManager.is()) { - basegfx::B2DPoint aPosition1(pHdl1->GetPos().X(), pHdl1->GetPos().Y()); - basegfx::B2DPoint aPosition2(pHdl2->GetPos().X(), pHdl2->GetPos().Y()); + basegfx::B2DPoint aPosition1(m_pHdl1->GetPos().X(), m_pHdl1->GetPos().Y()); + basegfx::B2DPoint aPosition2(m_pHdl2->GetPos().X(), m_pHdl2->GetPos().Y()); std::unique_ptr<sdr::overlay::OverlayObject> pNewOverlayObject(new sdr::overlay::OverlayLineStriped(