[Libreoffice-commits] core.git: sw/source

Miklos Vajna vmiklos at collabora.co.uk
Mon Dec 11 13:55:14 UTC 2017


 sw/source/core/access/accfrmobjmap.cxx |    8 ++++----
 sw/source/core/access/accfrmobjmap.hxx |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 48053ba5a110360b6d5eb19b6fb8a88e904b85c2
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Dec 11 08:10:20 2017 +0100

    sw: prefix members of SwAccessibleChildMap
    
    Change-Id: Icf886da2ab2ed2b2bdddd26efbaf6c889eef65f4
    Reviewed-on: https://gerrit.libreoffice.org/46209
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/core/access/accfrmobjmap.cxx b/sw/source/core/access/accfrmobjmap.cxx
index 9b43951c868a..03c46fd080f7 100644
--- a/sw/source/core/access/accfrmobjmap.cxx
+++ b/sw/source/core/access/accfrmobjmap.cxx
@@ -39,8 +39,8 @@ using namespace sw::access;
 SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea,
                                             const SwFrame& rFrame,
                                             SwAccessibleMap& rAccMap )
-    : nHellId( rAccMap.GetShell()->GetDoc()->getIDocumentDrawModelAccess().GetHellId() )
-    , nControlsId( rAccMap.GetShell()->GetDoc()->getIDocumentDrawModelAccess().GetControlsId() )
+    : mnHellId( rAccMap.GetShell()->GetDoc()->getIDocumentDrawModelAccess().GetHellId() )
+    , mnControlsId( rAccMap.GetShell()->GetDoc()->getIDocumentDrawModelAccess().GetControlsId() )
 {
     const bool bVisibleChildrenOnly = SwAccessibleChild( &rFrame ).IsVisibleChildrenOnly();
 
@@ -135,9 +135,9 @@ std::pair< SwAccessibleChildMap::iterator, bool > SwAccessibleChildMap::insert(
 {
     const SdrLayerID nLayer = pObj->GetLayer();
     SwAccessibleChildMapKey::LayerId eLayerId =
-                    (nHellId == nLayer)
+                    (mnHellId == nLayer)
                     ? SwAccessibleChildMapKey::HELL
-                    : ( (nControlsId == nLayer)
+                    : ( (mnControlsId == nLayer)
                         ? SwAccessibleChildMapKey::CONTROLS
                         : SwAccessibleChildMapKey::HEAVEN );
     SwAccessibleChildMapKey aKey( eLayerId, pObj->GetOrdNum() );
diff --git a/sw/source/core/access/accfrmobjmap.hxx b/sw/source/core/access/accfrmobjmap.hxx
index 154554f52f6a..ed0b520e8c41 100644
--- a/sw/source/core/access/accfrmobjmap.hxx
+++ b/sw/source/core/access/accfrmobjmap.hxx
@@ -95,8 +95,8 @@ public:
     typedef std::map<key_type,mapped_type,key_compare>::const_reverse_iterator  const_reverse_iterator;
 
 private:
-    const SdrLayerID nHellId;
-    const SdrLayerID nControlsId;
+    const SdrLayerID mnHellId;
+    const SdrLayerID mnControlsId;
     std::map<key_type,mapped_type,key_compare> maMap;
 
     std::pair< iterator, bool > insert( const sal_uInt32 nPos,


More information about the Libreoffice-commits mailing list