[Libreoffice-commits] core.git: include/svx svx/source

[Miklos Vajna (via logerrit)]

 include/svx/svdpage.hxx       |    2 +-
 svx/source/svdraw/svdpage.cxx |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 9f09ce383eef0750240a61d90341d56bffbce824
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Nov 13 08:11:07 2023 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Nov 13 09:05:27 2023 +0100

    svx: prefix members of SdrPage
    
    See tdf#94879 for motivation.
    
    Change-Id: I9b3b1116bca80a5c587931e4c8da9ac31e1faa5f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159353
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    Tested-by: Jenkins

diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index b197e4d2eb77..2a03e10cb2b1 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -444,7 +444,7 @@ protected:
     // new MasterPageDescriptorVector
     std::unique_ptr<sdr::MasterPageDescriptor> mpMasterPageDescriptor;
 
-    sal_uInt16          nPageNum;
+    sal_uInt16          m_nPageNum;
 
     bool                mbMaster : 1;               // flag if this is a 
MasterPage
     bool                mbInserted : 1;
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index bbe169e08b66..9b5965a5843a 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -1304,7 +1304,7 @@ SdrPage::SdrPage(SdrModel& rModel, bool bMasterPage)
     mnBorderRight(0),
     mnBorderLower(0),
     mpLayerAdmin(new SdrLayerAdmin(&rModel.GetLayerAdmin())),
-    nPageNum(0),
+    m_nPageNum(0),
     mbMaster(bMasterPage),
     mbInserted(false),
     mbObjectsNotPersistent(false),
@@ -1366,7 +1366,7 @@ void SdrPage::lateInit(const SdrPage& rSrcPage)
     mnBorderRight = rSrcPage.mnBorderRight;
     mnBorderLower = rSrcPage.mnBorderLower;
     mbBackgroundFullSize = rSrcPage.mbBackgroundFullSize;
-    nPageNum = rSrcPage.nPageNum;
+    m_nPageNum = rSrcPage.m_nPageNum;
 
     if(rSrcPage.TRG_HasMasterPage())
     {
@@ -1570,10 +1570,10 @@ bool SdrPage::IsBackgroundFullSize() const
 // #i68775# React on PageNum changes (from Model in most cases)
 void SdrPage::SetPageNum(sal_uInt16 nNew)
 {
-    if(nNew != nPageNum)
+    if(nNew != m_nPageNum)
     {
         // change
-        nPageNum = nNew;
+        m_nPageNum = nNew;
 
         // notify visualisations, also notifies e.g. buffered MasterPages
         ActionChanged();
@@ -1592,7 +1592,7 @@ sal_uInt16 SdrPage::GetPageNum() const
         if (getSdrModelFromSdrPage().IsPagNumsDirty())
             getSdrModelFromSdrPage().RecalcPageNums(false);
     }
-    return nPageNum;
+    return m_nPageNum;
 }
 
 void SdrPage::SetChanged()