svl: prefix members of SfxItemSet

Change-Id: I801aaa8ad9a4ff08dedd2f92b09d98c870c725b8

include/svl/itemiter.hxx

@@ -39,12 +39,12 @@ public:
     // falls es diese gibt, returne sie, sonst 0
     const SfxPoolItem* FirstItem()
                        { _nAkt = _nStt;
-                         return _rSet._nCount ? *(_rSet._aItems+_nAkt) : 0; }
+                         return _rSet.m_nCount ? *(_rSet.m_pItems+_nAkt) : nullptr; }
     const SfxPoolItem* LastItem()
                        { _nAkt = _nEnd;
-                         return _rSet._nCount ? *(_rSet._aItems+_nAkt) : 0; }
+                         return _rSet.m_nCount ? *(_rSet.m_pItems+_nAkt) : nullptr; }
     const SfxPoolItem* GetCurItem()
-                       { return _rSet._nCount ? *(_rSet._aItems+_nAkt) : 0; }
+                       { return _rSet.m_nCount ? *(_rSet.m_pItems+_nAkt) : nullptr; }
     const SfxPoolItem* NextItem();
 
     bool               IsAtStart() const { return _nAkt == _nStt; }

include/svl/itemset.hxx

@@ -41,11 +41,11 @@ class SVL_DLLPUBLIC SfxItemSet
 {
     friend class SfxItemIter;
 
-    SfxItemPool*                _pPool;         // pool, which is used
-    const SfxItemSet*           _pParent;       // derivation
-    SfxItemArray                _aItems;        // field of items
-    sal_uInt16*                     _pWhichRanges;  // array of Which Ranges
-    sal_uInt16                      _nCount;        // number of items
+    SfxItemPool*      m_pPool;         ///< pool that stores the items
+    const SfxItemSet* m_pParent;       ///< derivation
+    SfxItemArray      m_pItems;        ///< array of items
+    sal_uInt16*       m_pWhichRanges;  ///< array of Which Ranges
+    sal_uInt16        m_nCount;        ///< number of items
 
 friend class SfxItemPoolCache;
 friend class SfxAllItemSet;
@@ -57,7 +57,7 @@ private:
     SVL_DLLPRIVATE void                     InitRanges_Impl(sal_uInt16 nWh1, sal_uInt16 nWh2);
 
 public:
-    SfxItemArray                GetItems_Impl() const { return _aItems; }
+    SfxItemArray                GetItems_Impl() const { return m_pItems; }
 
 private:
     const SfxItemSet&           operator=(const SfxItemSet &) SAL_DELETED_FUNCTION;
@@ -80,7 +80,7 @@ public:
     virtual SfxItemSet *        Clone(bool bItems = true, SfxItemPool *pToPool = 0) const;
 
     // Get number of items
-    sal_uInt16                  Count() const { return _nCount; }
+    sal_uInt16                  Count() const { return m_nCount; }
     sal_uInt16                  TotalCount() const;
 
     const SfxPoolItem&          Get( sal_uInt16 nWhich, bool bSrchInParent = true ) const;
@@ -123,11 +123,11 @@ public:
     void                        Differentiate( const SfxItemSet& rSet );
     void                        MergeValue( const SfxPoolItem& rItem, bool bOverwriteDefaults = false  );
 
-    SfxItemPool*                GetPool() const { return _pPool; }
-    const sal_uInt16*           GetRanges() const { return _pWhichRanges; }
+    SfxItemPool*                GetPool() const { return m_pPool; }
+    const sal_uInt16*           GetRanges() const { return m_pWhichRanges; }
     void                        SetRanges( const sal_uInt16 *pRanges );
     void                        MergeRange( sal_uInt16 nFrom, sal_uInt16 nTo );
-    const SfxItemSet*           GetParent() const { return _pParent; }
+    const SfxItemSet*           GetParent() const { return m_pParent; }
 
     SvStream &                  Load( SvStream &, bool bDirect = false,
                                       const SfxItemPool *pRefPool = 0 );
@@ -141,7 +141,7 @@ public:
 
 inline void SfxItemSet::SetParent( const SfxItemSet* pNew )
 {
-    _pParent = pNew;
+    m_pParent = pNew;
 }
 
 class SVL_DLLPUBLIC SfxAllItemSet: public SfxItemSet

svl/README

@@ -44,7 +44,7 @@ set's SfxItemPool, and for poolable items only a single instance that
 compares equal under the predicate operator== will be stored in the pool,
 regardless of how many sets contain it, thus conserving memory.
 
-There are members _pWhichRanges for the valid ranges (as pairs of WhichIds),
-_nCount for the number of items contained, and _aItems for the pointers to
+There are members m_pWhichRanges for the valid ranges (as pairs of WhichIds),
+m_nCount for the number of items contained, and m_pItems for the pointers to
 the actual items.
 

svl/source/items/itemiter.cxx

@@ -25,14 +25,14 @@
 SfxItemIter::SfxItemIter( const SfxItemSet& rItemSet )
     : _rSet( rItemSet )
 {
-    if ( !_rSet._nCount )
+    if (!_rSet.m_nCount)
     {
         _nStt = 1;
         _nEnd = 0;
     }
     else
     {
-        SfxItemArray ppFnd = _rSet._aItems;
+        SfxItemArray ppFnd = _rSet.m_pItems;
 
         // Find the first Item that is set
         for ( _nStt = 0; !*(ppFnd + _nStt ); ++_nStt )
@@ -53,7 +53,7 @@ SfxItemIter::~SfxItemIter()
 
 const SfxPoolItem* SfxItemIter::NextItem()
 {
-    SfxItemArray ppFnd = _rSet._aItems;
+    SfxItemArray ppFnd = _rSet.m_pItems;
 
     if( _nAkt < _nEnd )
     {