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

[Miklos Vajna (via logerrit)]

 sw/inc/undobj.hxx               |    4 ++--
 sw/source/core/undo/undobj1.cxx |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d7b227d116086ef2023ae9b8b0eef8288c46cf3c
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Aug 21 09:05:41 2019 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Wed Aug 21 10:05:09 2019 +0200

    sw: prefix members of SwUndoDelLayFormat
    
    See tdf#94879 for motivation.
    
    Change-Id: I16fe75a5a7fd586e021cd5d49676031b97838165
    Reviewed-on: https://gerrit.libreoffice.org/77867
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Jenkins

diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index b9acf4952804..030c7087bfe6 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -320,7 +320,7 @@ public:
 
 class SwUndoDelLayFormat : public SwUndoFlyBase
 {
-    bool bShowSelFrame;
+    bool m_bShowSelFrame;
 public:
     SwUndoDelLayFormat( SwFrameFormat* pFormat );
 
@@ -329,7 +329,7 @@ public:
 
     void RedoForRollback();
 
-    void ChgShowSel( bool bNew ) { bShowSelFrame = bNew; }
+    void ChgShowSel( bool bNew ) { m_bShowSelFrame = bNew; }
 
     virtual SwRewriter GetRewriter() const override;
 
diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx
index 6a2387f8712f..afb8c0b8f810 100644
--- a/sw/source/core/undo/undobj1.cxx
+++ b/sw/source/core/undo/undobj1.cxx
@@ -397,7 +397,7 @@ lcl_GetSwUndoId(SwFrameFormat const *const pFrameFormat)
 
 SwUndoDelLayFormat::SwUndoDelLayFormat( SwFrameFormat* pFormat )
     : SwUndoFlyBase( pFormat, lcl_GetSwUndoId(pFormat) )
-    , bShowSelFrame( true )
+    , m_bShowSelFrame( true )
 {
     SwDoc* pDoc = pFormat->GetDoc();
     DelFly( pDoc );
@@ -430,7 +430,7 @@ SwRewriter SwUndoDelLayFormat::GetRewriter() const
 
 void SwUndoDelLayFormat::UndoImpl(::sw::UndoRedoContext & rContext)
 {
-    InsFly( rContext, bShowSelFrame );
+    InsFly( rContext, m_bShowSelFrame );
 }
 
 void SwUndoDelLayFormat::RedoImpl(::sw::UndoRedoContext & rContext)