From c8c42754ca8adf2b909261fde01fb3dbad8d50c0 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 11 Sep 2023 08:18:38 +0200 Subject: svx: prefix members of SdrHdl See tdf#94879 for motivation. Change-Id: Icd2be0663b7b498bb06f09ced97673244e328a9e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156809 Reviewed-by: Miklos Vajna Tested-by: Jenkins --- sd/source/ui/animations/motionpathtag.cxx | 4 ++-- sd/source/ui/annotations/annotationtag.cxx | 6 +++--- sd/source/ui/view/viewoverlaymanager.cxx | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index 5ddcc9ac7921..d3153f892b94 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -278,10 +278,10 @@ void SdPathHdl::CreateB2dIAObject() // first throw away old one GetRidOfIAObject(); - if(!pHdlList) + if(!m_pHdlList) return; - SdrMarkView* pView = pHdlList->GetView(); + SdrMarkView* pView = m_pHdlList->GetView(); if(!pView || pView->areMarkHandlesHidden()) return; diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index dbadf4cb6fe1..4b37ffaeea62 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -194,17 +194,17 @@ void AnnotationHdl::CreateB2dIAObject() const Point aTagPos( GetPos() ); basegfx::B2DPoint aPosition( aTagPos.X(), aTagPos.Y() ); - const bool bFocused = IsFocusHdl() && pHdlList && (pHdlList->GetFocusHdl() == this); + const bool bFocused = IsFocusHdl() && m_pHdlList && (m_pHdlList->GetFocusHdl() == this); BitmapEx aBitmapEx( mxTag->CreateAnnotationBitmap(mxTag->isSelected()) ); BitmapEx aBitmapEx2; if( bFocused ) aBitmapEx2 = mxTag->CreateAnnotationBitmap(!mxTag->isSelected() ); - if(!pHdlList) + if(!m_pHdlList) return; - SdrMarkView* pView = pHdlList->GetView(); + SdrMarkView* pView = m_pHdlList->GetView(); if(!pView || pView->areMarkHandlesHidden()) return; diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 42399fc21a33..7826f079b699 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -184,10 +184,10 @@ void ImageButtonHdl::HideTip() void ImageButtonHdl::ShowTip() { - if (!pHdlList || !pHdlList->GetView() || mnHighlightId == -1) + if (!m_pHdlList || !m_pHdlList->GetView() || mnHighlightId == -1) return; - OutputDevice* pDev = pHdlList->GetView()->GetFirstOutputDevice(); + OutputDevice* pDev = m_pHdlList->GetView()->GetFirstOutputDevice(); if( pDev == nullptr ) pDev = Application::GetDefaultDevice(); @@ -200,7 +200,7 @@ void ImageButtonHdl::ShowTip() else if (mnHighlightId == 3) aHelpPos.Move(maImageSize.Width(), maImageSize.Height()); ::tools::Rectangle aLogicPix(aHelpPos, maImageSize); - vcl::Window* pWindow = pHdlList->GetView()->GetFirstOutputDevice()->GetOwnerWindow(); + vcl::Window* pWindow = m_pHdlList->GetView()->GetFirstOutputDevice()->GetOwnerWindow(); ::tools::Rectangle aScreenRect(pWindow->OutputToScreenPixel(aLogicPix.TopLeft()), pWindow->OutputToScreenPixel(aLogicPix.BottomRight())); Help::ShowQuickHelp(pWindow, aScreenRect, aHelpText); @@ -213,11 +213,11 @@ void ImageButtonHdl::onHelpRequest() void ImageButtonHdl::onMouseEnter(const MouseEvent& rMEvt) { - if( !(pHdlList && pHdlList->GetView())) + if( !(m_pHdlList && m_pHdlList->GetView())) return; int nHighlightId = 0; - OutputDevice* pDev = pHdlList->GetView()->GetFirstOutputDevice(); + OutputDevice* pDev = m_pHdlList->GetView()->GetFirstOutputDevice(); if( pDev == nullptr ) pDev = Application::GetDefaultDevice(); @@ -259,10 +259,10 @@ void ImageButtonHdl::CreateB2dIAObject() maImageSize.setWidth( maImageSize.Width() >> 1 ); maImageSize.setHeight( maImageSize.Height() >> 1 ); - if(!pHdlList) + if(!m_pHdlList) return; - SdrMarkView* pView = pHdlList->GetView(); + SdrMarkView* pView = m_pHdlList->GetView(); if(!pView || pView->areMarkHandlesHidden()) return; -- cgit