include/svx/connctrl.hxx | 12 ++++++------ svx/source/dialog/connctrl.cxx | 30 +++++++++++++++--------------- 2 files changed, 21 insertions(+), 21 deletions(-)
New commits: commit 5630afeeef233d2b0b519fe0e7c561d342d201d6 Author: Miklos Vajna <[email protected]> AuthorDate: Mon Oct 20 09:05:45 2025 +0200 Commit: Miklos Vajna <[email protected]> CommitDate: Mon Oct 20 12:01:06 2025 +0200 svx: prefix members of SvxXConnectionPreview See tdf#94879 for motivation. Change-Id: Iea4f9b55e4d769d891fbf7d88cb97ef307e219be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192681 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins diff --git a/include/svx/connctrl.hxx b/include/svx/connctrl.hxx index 8e416674b1b2..d4eca1e6feee 100644 --- a/include/svx/connctrl.hxx +++ b/include/svx/connctrl.hxx @@ -39,14 +39,14 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxXConnectionPreview final : public weld::C friend class SvxConnectionPage; private: - MapMode aNewMapMode; - rtl::Reference<SdrEdgeObj> pEdgeObj; + MapMode m_aNewMapMode; + rtl::Reference<SdrEdgeObj> m_pEdgeObj; rtl::Reference<SdrPage> mxSdrPage; - const SdrView* pView; + const SdrView* m_pView; SVX_DLLPRIVATE void AdaptSize(); - SVX_DLLPRIVATE void SetMapMode(const MapMode& rNewMapMode) { aNewMapMode = rNewMapMode; } - SVX_DLLPRIVATE const MapMode& GetMapMode() const { return aNewMapMode; } + SVX_DLLPRIVATE void SetMapMode(const MapMode& rNewMapMode) { m_aNewMapMode = rNewMapMode; } + SVX_DLLPRIVATE const MapMode& GetMapMode() const { return m_aNewMapMode; } public: SvxXConnectionPreview(); virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; @@ -60,7 +60,7 @@ public: sal_uInt16 GetLineDeltaCount() const; void Construct(); - void SetView( const SdrView* pSdrView ) { pView = pSdrView; } + void SetView( const SdrView* pSdrView ) { m_pView = pSdrView; } }; #endif // INCLUDED_SVX_CONNCTRL_HXX diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx index 41f825b91ab0..3e0d48d15e4b 100644 --- a/svx/source/dialog/connctrl.cxx +++ b/svx/source/dialog/connctrl.cxx @@ -34,7 +34,7 @@ #include <memory> SvxXConnectionPreview::SvxXConnectionPreview() - : pView(nullptr) + : m_pView(nullptr) { SetMapMode(MapMode(MapUnit::Map100thMM)); } @@ -66,7 +66,7 @@ void SvxXConnectionPreview::AdaptSize() SetMapMode(MapMode(MapUnit::Map100thMM)); - OutputDevice* pOD = pView->GetFirstOutputDevice(); // GetWin( 0 ); + OutputDevice* pOD = m_pView->GetFirstOutputDevice(); // GetWin( 0 ); tools::Rectangle aRect = mxSdrPage->GetAllObjBoundRect(); MapMode aMapMode = GetMapMode(); @@ -125,9 +125,9 @@ void SvxXConnectionPreview::AdaptSize() void SvxXConnectionPreview::Construct() { - assert(pView && "No valid view is passed on!"); + assert(m_pView && "No valid view is passed on!"); - const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); + const SdrMarkList& rMarkList = m_pView->GetMarkedObjectList(); const size_t nMarkCount = rMarkList.GetMarkCount(); if( nMarkCount >= 1 ) @@ -148,15 +148,15 @@ void SvxXConnectionPreview::Construct() if(!mxSdrPage) { mxSdrPage = new SdrPage( - pView->getSdrModelFromSdrView(), + m_pView->getSdrModelFromSdrView(), false); } const SdrEdgeObj* pTmpEdgeObj = static_cast<const SdrEdgeObj*>(pObj); - pEdgeObj = SdrObject::Clone(*pTmpEdgeObj, mxSdrPage->getSdrModelFromSdrPage()); + m_pEdgeObj = SdrObject::Clone(*pTmpEdgeObj, mxSdrPage->getSdrModelFromSdrPage()); - SdrObjConnection& rConn1 = pEdgeObj->GetConnection( true ); - SdrObjConnection& rConn2 = pEdgeObj->GetConnection( false ); + SdrObjConnection& rConn1 = m_pEdgeObj->GetConnection( true ); + SdrObjConnection& rConn2 = m_pEdgeObj->GetConnection( false ); rConn1 = pTmpEdgeObj->GetConnection( true ); rConn2 = pTmpEdgeObj->GetConnection( false ); @@ -168,24 +168,24 @@ void SvxXConnectionPreview::Construct() { rtl::Reference<SdrObject> pObj1 = pTmpObj1->CloneSdrObject(mxSdrPage->getSdrModelFromSdrPage()); mxSdrPage->InsertObject( pObj1.get() ); - pEdgeObj->ConnectToNode( true, pObj1.get() ); + m_pEdgeObj->ConnectToNode( true, pObj1.get() ); } if( pTmpObj2 ) { rtl::Reference<SdrObject> pObj2 = pTmpObj2->CloneSdrObject(mxSdrPage->getSdrModelFromSdrPage()); mxSdrPage->InsertObject( pObj2.get() ); - pEdgeObj->ConnectToNode( false, pObj2.get() ); + m_pEdgeObj->ConnectToNode( false, pObj2.get() ); } - mxSdrPage->InsertObject( pEdgeObj.get() ); + mxSdrPage->InsertObject( m_pEdgeObj.get() ); } } } - if( !pEdgeObj ) + if( !m_pEdgeObj ) { - pEdgeObj = new SdrEdgeObj(pView->getSdrModelFromSdrView()); + m_pEdgeObj = new SdrEdgeObj(m_pView->getSdrModelFromSdrView()); } AdaptSize(); @@ -225,7 +225,7 @@ void SvxXConnectionPreview::Paint(vcl::RenderContext& rRenderContext, const tool void SvxXConnectionPreview::SetAttributes( const SfxItemSet& rInAttrs ) { - pEdgeObj->SetMergedItemSetAndBroadcast(rInAttrs); + m_pEdgeObj->SetMergedItemSetAndBroadcast(rInAttrs); Invalidate(); } @@ -234,7 +234,7 @@ void SvxXConnectionPreview::SetAttributes( const SfxItemSet& rInAttrs ) sal_uInt16 SvxXConnectionPreview::GetLineDeltaCount() const { - const SfxItemSet& rSet = pEdgeObj->GetMergedItemSet(); + const SfxItemSet& rSet = m_pEdgeObj->GetMergedItemSet(); sal_uInt16 nCount(0); if(SfxItemState::INVALID != rSet.GetItemState(SDRATTR_EDGELINEDELTACOUNT))
