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

[Miklos Vajna]

 sw/source/core/inc/frmtool.hxx    |    2 +-
 sw/source/core/layout/frmtool.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fd27564ecbdf0a85b05e2578759dca9ad6efcd05
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date:   Mon Feb 20 09:27:09 2017 +0100

    sw: prefix members of SwBorderAttrAccess
    
    Change-Id: Iff8bf7d5d2b5b50e21726429c8b836ae560400e1
    Reviewed-on: https://gerrit.libreoffice.org/34458
    Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
    Tested-by: Jenkins <c...@libreoffice.org>

diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index ed803b3..a94dc26 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -367,7 +367,7 @@ public:
 
 class SwBorderAttrAccess : public SwCacheAccess
 {
-    const SwFrame *pConstructor;      //opt: for passing on to SwBorderAttrs
+    const SwFrame *m_pConstructor;      //opt: for passing on to SwBorderAttrs
 
 protected:
     virtual SwCacheObj *NewObj() override;
diff --git a/sw/source/core/layout/frmtool.cxx 
b/sw/source/core/layout/frmtool.cxx
index 48f293a..b2c88d2 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -2127,14 +2127,14 @@ SwBorderAttrAccess::SwBorderAttrAccess( SwCache &rCach, 
const SwFrame *pFrame )
                    (pFrame->IsContentFrame() ?
                       static_cast<SwModify const *>(static_cast<const 
SwContentFrame*>(pFrame)->GetNode())->IsInCache() :
                       static_cast<SwModify const *>(static_cast<const 
SwLayoutFrame*>(pFrame)->GetFormat())->IsInCache()) ),
-    pConstructor( pFrame )
+    m_pConstructor( pFrame )
 {
 }
 
 SwCacheObj *SwBorderAttrAccess::NewObj()
 {
     const_cast<SwModify *>(static_cast<SwModify const 
*>(m_pOwner))->SetInCache( true );
-    return new SwBorderAttrs( static_cast<SwModify const *>(m_pOwner), 
pConstructor );
+    return new SwBorderAttrs( static_cast<SwModify const *>(m_pOwner), 
m_pConstructor );
 }
 
 SwBorderAttrs *SwBorderAttrAccess::Get()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits