include/svx/xpoly.hxx | 2 +- svx/source/xoutdev/_xpoly.cxx | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-)
New commits: commit 20ea8a89aa5fc733ddc9ade7b3d40a2ca62a563f Author: Miklos Vajna <vmik...@collabora.com> AuthorDate: Mon Sep 2 08:11:35 2024 +0200 Commit: Miklos Vajna <vmik...@collabora.com> CommitDate: Mon Sep 2 09:54:46 2024 +0200 svx: prefix members of XPolyPolygon See tdf#94879 for motivation. Change-Id: I09d2827c7e2dd91f9bf160e47c22180bde682932 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172727 Reviewed-by: Miklos Vajna <vmik...@collabora.com> Tested-by: Jenkins diff --git a/include/svx/xpoly.hxx b/include/svx/xpoly.hxx index 27256023fbcc..8cdfa03cfdf8 100644 --- a/include/svx/xpoly.hxx +++ b/include/svx/xpoly.hxx @@ -113,7 +113,7 @@ class ImpXPolyPolygon; class XPolyPolygon final { - o3tl::cow_wrapper< ImpXPolyPolygon > pImpXPolyPolygon; + o3tl::cow_wrapper< ImpXPolyPolygon > m_pImpXPolyPolygon; public: XPolyPolygon(); diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx index d93e56412b7b..7688f6a99bfd 100644 --- a/svx/source/xoutdev/_xpoly.cxx +++ b/svx/source/xoutdev/_xpoly.cxx @@ -856,7 +856,7 @@ XPolyPolygon::~XPolyPolygon() = default; void XPolyPolygon::Insert( XPolygon&& rXPoly ) { - pImpXPolyPolygon->aXPolyList.emplace_back( std::move(rXPoly) ); + m_pImpXPolyPolygon->aXPolyList.emplace_back( std::move(rXPoly) ); } /// insert all XPolygons of a XPolyPolygon @@ -864,38 +864,38 @@ void XPolyPolygon::Insert( const XPolyPolygon& rXPolyPoly ) { for ( size_t i = 0; i < rXPolyPoly.Count(); i++) { - pImpXPolyPolygon->aXPolyList.emplace_back( rXPolyPoly[i] ); + m_pImpXPolyPolygon->aXPolyList.emplace_back( rXPolyPoly[i] ); } } void XPolyPolygon::Remove( sal_uInt16 nPos ) { - pImpXPolyPolygon->aXPolyList.erase( pImpXPolyPolygon->aXPolyList.begin() + nPos ); + m_pImpXPolyPolygon->aXPolyList.erase( m_pImpXPolyPolygon->aXPolyList.begin() + nPos ); } const XPolygon& XPolyPolygon::GetObject( sal_uInt16 nPos ) const { - return pImpXPolyPolygon->aXPolyList[ nPos ]; + return m_pImpXPolyPolygon->aXPolyList[ nPos ]; } void XPolyPolygon::Clear() { - pImpXPolyPolygon->aXPolyList.clear(); + m_pImpXPolyPolygon->aXPolyList.clear(); } sal_uInt16 XPolyPolygon::Count() const { - return static_cast<sal_uInt16>(pImpXPolyPolygon->aXPolyList.size()); + return static_cast<sal_uInt16>(m_pImpXPolyPolygon->aXPolyList.size()); } tools::Rectangle XPolyPolygon::GetBoundRect() const { - size_t nXPoly = pImpXPolyPolygon->aXPolyList.size(); + size_t nXPoly = m_pImpXPolyPolygon->aXPolyList.size(); tools::Rectangle aRect; for ( size_t n = 0; n < nXPoly; n++ ) { - XPolygon const & rXPoly = pImpXPolyPolygon->aXPolyList[ n ]; + XPolygon const & rXPoly = m_pImpXPolyPolygon->aXPolyList[ n ]; aRect.Union( rXPoly.GetBoundRect() ); } @@ -904,7 +904,7 @@ tools::Rectangle XPolyPolygon::GetBoundRect() const XPolygon& XPolyPolygon::operator[]( sal_uInt16 nPos ) { - return pImpXPolyPolygon->aXPolyList[ nPos ]; + return m_pImpXPolyPolygon->aXPolyList[ nPos ]; } XPolyPolygon& XPolyPolygon::operator=( const XPolyPolygon& ) = default; @@ -925,7 +925,7 @@ void XPolyPolygon::Distort(const tools::Rectangle& rRefRect, const XPolygon& rDistortedRect) { for (size_t i = 0; i < Count(); i++) - pImpXPolyPolygon->aXPolyList[ i ].Distort(rRefRect, rDistortedRect); + m_pImpXPolyPolygon->aXPolyList[ i ].Distort(rRefRect, rDistortedRect); } basegfx::B2DPolyPolygon XPolyPolygon::getB2DPolyPolygon() const