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

[Michael Stahl]

 sw/source/core/doc/DocumentRedlineManager.cxx |   22 ++++++++++++----------
 sw/source/core/inc/DocumentRedlineManager.hxx |    3 +--
 2 files changed, 13 insertions(+), 12 deletions(-)

New commits:
commit 61e048808873c4edea983de0ab54366cd41e2082
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jan 25 12:13:50 2018 +0100

    sw: uninitialised DocumentRedlineManager::bHideLinineTooltips
    
    (regression from 86e3f95cff4d3dad48d64e50e0c4b05034fa7064)
    
    Change-Id: I48db6f070d7cf5ef0071952ad34822f75d472a21

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx
index d43b5f1cb855..166152f275b7 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -606,14 +606,16 @@ namespace
 namespace sw
 {
 
-DocumentRedlineManager::DocumentRedlineManager( SwDoc& i_rSwdoc ) : m_rDoc( i_rSwdoc ),
-                                                                    meRedlineFlags(RedlineFlags::ShowInsert | RedlineFlags::ShowDelete),
-                                                                    mpRedlineTable( new SwRedlineTable ),
-                                                                    mpExtraRedlineTable ( new SwExtraRedlineTable ),
-                                                                    mpAutoFormatRedlnComment( nullptr ),
-                                                                    mbIsRedlineMove(false),
-                                                                    mbReadlineChecked(false),
-                                                                    mnAutoFormatRedlnCommentNo( 0 )
+DocumentRedlineManager::DocumentRedlineManager(SwDoc& i_rSwdoc)
+    : m_rDoc(i_rSwdoc)
+    , meRedlineFlags(RedlineFlags::ShowInsert | RedlineFlags::ShowDelete)
+    , mpRedlineTable(new SwRedlineTable)
+    , mpExtraRedlineTable(new SwExtraRedlineTable)
+    , mpAutoFormatRedlnComment(nullptr)
+    , mbIsRedlineMove(false)
+    , mbReadlineChecked(false)
+    , mnAutoFormatRedlnCommentNo(0)
+    , m_bHideInlineTooltips(false)
 {
 }
 
@@ -2719,12 +2721,12 @@ void DocumentRedlineManager::checkRedlining(RedlineFlags& _rReadlineMode)
 
 bool DocumentRedlineManager::IsHideInlineTooltips()
 {
-    return bHideInlineTooltips;
+    return m_bHideInlineTooltips;
 }
 
 void DocumentRedlineManager::SetHideInlineTooltips(bool bSet)
 {
-    bHideInlineTooltips = bSet;
+    m_bHideInlineTooltips = bSet;
 }
 
 DocumentRedlineManager::~DocumentRedlineManager()
diff --git a/sw/source/core/inc/DocumentRedlineManager.hxx b/sw/source/core/inc/DocumentRedlineManager.hxx
index 26c8050dbb2c..52be64fa7d28 100644
--- a/sw/source/core/inc/DocumentRedlineManager.hxx
+++ b/sw/source/core/inc/DocumentRedlineManager.hxx
@@ -30,8 +30,6 @@ namespace sw
 
 class DocumentRedlineManager : public IDocumentRedlineAccess
 {
-    bool bHideInlineTooltips : 1;
-
 public:
     DocumentRedlineManager( SwDoc& i_rSwdoc );
 
@@ -144,6 +142,7 @@ private:
     sal_uInt16 mnAutoFormatRedlnCommentNo;  /**< SeqNo for conjoining of AutoFormat-Redlines.
                                          by the UI. Managed by SwAutoFormat! */
     css::uno::Sequence <sal_Int8 > maRedlinePasswd;
+    bool m_bHideInlineTooltips : 1;
 };
 
 }