svx: prefix members of E3dVolumeMarker, ImpEdgeHdl, NameOrIndex and ...

... SdrObjUserData

See tdf#94879 for motivation.

Change-Id: I4d330b0f8e08a3bdfc2c256c2ee86ac584947fc0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155080
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins

6 files changed, 28 insertions, 28 deletions

diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index 606dd8d5afa7..61c0100ad144 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -372,7 +372,7 @@ private:
 
 class E3dVolumeMarker final : public SdrHdl
 {
-    basegfx::B2DPolyPolygon             aWireframePoly;
+    basegfx::B2DPolyPolygon             m_aWireframePoly;
 
     // create marker for this kind
     virtual void CreateB2dIAObject() override;
@@ -384,17 +384,17 @@ public:
 
 class ImpEdgeHdl final : public SdrHdl
 {
-    SdrEdgeLineCode eLineCode;
+    SdrEdgeLineCode m_eLineCode;
 
     // create marker for this kind
     virtual void CreateB2dIAObject() override;
 
 public:
-    ImpEdgeHdl(const Point& rPnt, SdrHdlKind eNewKind): SdrHdl(rPnt,eNewKind),eLineCode(SdrEdgeLineCode::MiddleLine) {}
+    ImpEdgeHdl(const Point& rPnt, SdrHdlKind eNewKind): SdrHdl(rPnt,eNewKind),m_eLineCode(SdrEdgeLineCode::MiddleLine) {}
     virtual ~ImpEdgeHdl() override;
 
     void SetLineCode(SdrEdgeLineCode eCode);
-    SdrEdgeLineCode GetLineCode() const     { return eLineCode; }
+    SdrEdgeLineCode GetLineCode() const     { return m_eLineCode; }
     bool IsHorzDrag() const;
     virtual PointerStyle GetPointer() const override;
 };
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index ed62c1db983f..35f6a47bd6e2 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -150,8 +150,8 @@ public:
  */
 class SVXCORE_DLLPUBLIC SdrObjUserData
 {
-    SdrInventor                      nInventor;
-    sal_uInt16                       nIdentifier;
+    SdrInventor                      m_nInventor;
+    sal_uInt16                       m_nIdentifier;
 
     void operator=(const SdrObjUserData& rData) = delete;
     bool operator==(const SdrObjUserData& rData) const = delete;
@@ -163,8 +163,8 @@ public:
     virtual ~SdrObjUserData();
 
     virtual std::unique_ptr<SdrObjUserData> Clone(SdrObject* pObj1) const = 0; // #i71039# NULL -> 0
-    SdrInventor GetInventor() const { return nInventor;}
-    sal_uInt16 GetId() const { return nIdentifier;}
+    SdrInventor GetInventor() const { return m_nInventor;}
+    sal_uInt16 GetId() const { return m_nIdentifier;}
 };
 
 /**
diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx
index f6b19595a9f8..b51af17a4d4d 100644
--- a/include/svx/xit.hxx
+++ b/include/svx/xit.hxx
@@ -36,13 +36,13 @@ typedef bool (*SvxCompareValueFunc)( const NameOrIndex* p1, const NameOrIndex* p
 
 class SVXCORE_DLLPUBLIC NameOrIndex : public SfxStringItem
 {
-    sal_Int32    nPalIndex;
+    sal_Int32    m_nPalIndex;
 
 protected:
-    void    Detach()    { nPalIndex = -1; }
+    void    Detach()    { m_nPalIndex = -1; }
 
 public:
-            NameOrIndex() { nPalIndex = -1; }
+            NameOrIndex() { m_nPalIndex = -1; }
             NameOrIndex(TypedWhichId<NameOrIndex> nWhich, sal_Int32 nIndex);
             NameOrIndex(TypedWhichId<NameOrIndex> nWhich, const OUString& rName);
             NameOrIndex(const NameOrIndex& rNameOrIndex);
@@ -52,8 +52,8 @@ public:
 
             OUString const & GetName() const              { return GetValue();   }
             void         SetName(const OUString& rName) { SetValue(rName);     }
-            bool         IsIndex() const          { return (nPalIndex >= 0); }
-            sal_Int32    GetPalIndex() const { return nPalIndex; }
+            bool         IsIndex() const          { return (m_nPalIndex >= 0); }
+            sal_Int32    GetPalIndex() const { return m_nPalIndex; }
 
     /** this static checks if the given NameOrIndex item has a unique name for its value.
         The returned String is a unique name for an item with this value in both given pools.
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 379b3ed3f73e..de6ffcd8175f 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -1553,7 +1553,7 @@ void SdrHdlBezWgt::CreateB2dIAObject()
 
 E3dVolumeMarker::E3dVolumeMarker(const basegfx::B2DPolyPolygon& rWireframePoly)
 {
-    aWireframePoly = rWireframePoly;
+    m_aWireframePoly = rWireframePoly;
 }
 
 void E3dVolumeMarker::CreateB2dIAObject()
@@ -1579,11 +1579,11 @@ void E3dVolumeMarker::CreateB2dIAObject()
         if(rPageWindow.GetPaintWindow().OutputToWindow())
         {
             const rtl::Reference< sdr::overlay::OverlayManager >& xManager = rPageWindow.GetOverlayManager();
-            if (xManager.is() && aWireframePoly.count())
+            if (xManager.is() && m_aWireframePoly.count())
             {
                 std::unique_ptr<sdr::overlay::OverlayObject> pNewOverlayObject(new
                     sdr::overlay::OverlayPolyPolygonStripedAndFilled(
-                        aWireframePoly));
+                        m_aWireframePoly));
 
                 pNewOverlayObject->setBaseColor(COL_BLACK);
 
@@ -1669,10 +1669,10 @@ void ImpEdgeHdl::CreateB2dIAObject()
 
 void ImpEdgeHdl::SetLineCode(SdrEdgeLineCode eCode)
 {
-    if(eLineCode != eCode)
+    if(m_eLineCode != eCode)
     {
         // remember new value
-        eLineCode = eCode;
+        m_eLineCode = eCode;
 
         // create new display
         Touch();
@@ -1705,7 +1705,7 @@ bool ImpEdgeHdl::IsHorzDrag() const
     const SdrEdgeInfoRec& rInfo=pEdge->aEdgeInfo;
     if (eEdgeKind==SdrEdgeKind::OrthoLines || eEdgeKind==SdrEdgeKind::Bezier)
     {
-        return !rInfo.ImpIsHorzLine(eLineCode,*pEdge->pEdgeTrack);
+        return !rInfo.ImpIsHorzLine(m_eLineCode,*pEdge->pEdgeTrack);
     }
     else if (eEdgeKind==SdrEdgeKind::ThreeLines)
     {
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 5c7789ee7ed0..dc9e36a008ce 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -148,12 +148,12 @@ SdrObjMacroHitRec::SdrObjMacroHitRec() :
 
 
 SdrObjUserData::SdrObjUserData(SdrInventor nInv, sal_uInt16 nId) :
-    nInventor(nInv),
-    nIdentifier(nId) {}
+    m_nInventor(nInv),
+    m_nIdentifier(nId) {}
 
 SdrObjUserData::SdrObjUserData(const SdrObjUserData& rData) :
-    nInventor(rData.nInventor),
-    nIdentifier(rData.nIdentifier) {}
+    m_nInventor(rData.m_nInventor),
+    m_nIdentifier(rData.m_nIdentifier) {}
 
 SdrObjUserData::~SdrObjUserData() {}
 
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 1550b8ac02a1..e9e8f3b1a706 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -98,26 +98,26 @@ typedef std::map<OUString, OUString> StringMap;
 
 NameOrIndex::NameOrIndex(TypedWhichId<NameOrIndex> _nWhich, sal_Int32 nIndex) :
     SfxStringItem(_nWhich, OUString()),
-    nPalIndex(nIndex)
+    m_nPalIndex(nIndex)
 {
 }
 
 NameOrIndex::NameOrIndex(TypedWhichId<NameOrIndex> _nWhich, const OUString& rName) :
     SfxStringItem(_nWhich, rName),
-    nPalIndex(-1)
+    m_nPalIndex(-1)
 {
 }
 
 NameOrIndex::NameOrIndex(const NameOrIndex& rNameOrIndex) :
     SfxStringItem(rNameOrIndex),
-    nPalIndex(rNameOrIndex.nPalIndex)
+    m_nPalIndex(rNameOrIndex.m_nPalIndex)
 {
 }
 
 bool NameOrIndex::operator==(const SfxPoolItem& rItem) const
 {
     return ( SfxStringItem::operator==(rItem) &&
-            static_cast<const NameOrIndex&>(rItem).nPalIndex == nPalIndex );
+            static_cast<const NameOrIndex&>(rItem).m_nPalIndex == m_nPalIndex );
 }
 
 NameOrIndex* NameOrIndex::Clone(SfxItemPool* /*pPool*/) const
@@ -256,7 +256,7 @@ void NameOrIndex::dumpAsXml(xmlTextWriterPtr pWriter) const
     (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
     (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("isIndex"), BAD_CAST(OString::boolean(IsIndex()).getStr()));
     (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("name"), BAD_CAST(GetName().toUtf8().getStr()));
-    (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("index"), BAD_CAST(OString::number(nPalIndex).getStr()));
+    (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("index"), BAD_CAST(OString::number(m_nPalIndex).getStr()));
     (void)xmlTextWriterEndElement(pWriter);
 }