core.git: include/svx svx/source

[Miklos Vajna (via logerrit)]

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

New commits:
commit 0f1194bff86f2b34df624c0a67b211ab98bcf729
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Mar 18 08:26:57 2024 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Mar 18 12:42:55 2024 +0100

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

diff --git a/include/svx/svdlayer.hxx b/include/svx/svdlayer.hxx
index de453a6bf8c2..88cfabddb9c0 100644
--- a/include/svx/svdlayer.hxx
+++ b/include/svx/svdlayer.hxx
@@ -62,11 +62,11 @@ class SVXCORE_DLLPUBLIC SdrLayer
     OUString maName;
     OUString maTitle;
     OUString maDescription;
-    SdrModel*  pModel; // For broadcasting
+    SdrModel*  m_pModel; // For broadcasting
     bool mbVisibleODF; // corresponds to ODF draw:display
     bool mbPrintableODF; // corresponds to ODF draw:display
     bool mbLockedODF; // corresponds to ODF draw:protected
-    SdrLayerID nID;
+    SdrLayerID m_nID;
 
     SdrLayer(SdrLayerID nNewID, OUString aNewName);
 
@@ -91,8 +91,8 @@ public:
     void SetLockedODF(bool bLockedODF) { mbLockedODF = bLockedODF; }
     bool IsLockedODF() const { return mbLockedODF; }
 
-    SdrLayerID    GetID() const                               { return nID; }
-    void          SetModel(SdrModel* pNewModel)               { 
pModel=pNewModel; }
+    SdrLayerID    GetID() const                               { return m_nID; }
+    void          SetModel(SdrModel* pNewModel)               { 
m_pModel=pNewModel; }
 };
 
 #define SDRLAYER_MAXCOUNT 255
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index 74d5222f92b1..200dccd2f520 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -69,7 +69,7 @@ void SdrLayerIDSet::PutValue( const css::uno::Any & rAny )
 }
 
 SdrLayer::SdrLayer(SdrLayerID nNewID, OUString aNewName) :
-    maName(std::move(aNewName)), pModel(nullptr), nID(nNewID)
+    maName(std::move(aNewName)), m_pModel(nullptr), m_nID(nNewID)
 {
     // ODF default values
     mbVisibleODF = true;
@@ -84,17 +84,17 @@ void SdrLayer::SetName(const OUString& rNewName)
 
     maName = rNewName;
 
-    if (pModel)
+    if (m_pModel)
     {
         SdrHint aHint(SdrHintKind::LayerChange);
-        pModel->Broadcast(aHint);
-        pModel->SetChanged();
+        m_pModel->Broadcast(aHint);
+        m_pModel->SetChanged();
     }
 }
 
 bool SdrLayer::operator==(const SdrLayer& rCmpLayer) const
 {
-    return (nID == rCmpLayer.nID
+    return (m_nID == rCmpLayer.m_nID
         && maName == rCmpLayer.maName);
 }