summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2019-08-12 09:02:20 +0200
committerMiklos Vajna <vmiklos@collabora.com>2019-08-12 09:52:15 +0200
commite71b46196cdfa8fa753b4f5030c8e95eb61105ee (patch)
tree8bb29581dd396db9185313e8a8d4437e63b1cb8e /sw
parentf3261ba74815b30f1018954bfb9ecd332fa8f1d5 (diff)
sw: prefix members of SwUndo
See tdf#94879 for motivation. Change-Id: I390704209678710d7aef3dc90aef509c355cc4e1 Reviewed-on: https://gerrit.libreoffice.org/77330 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/undobj.hxx8
-rw-r--r--sw/source/core/undo/undel.cxx2
-rw-r--r--sw/source/core/undo/undobj.cxx6
-rw-r--r--sw/source/core/undo/unins.cxx2
-rw-r--r--sw/source/core/undo/unovwr.cxx2
-rw-r--r--sw/source/core/undo/unredln.cxx2
6 files changed, 11 insertions, 11 deletions
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 8d7afa1bc046..b9acf4952804 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -52,12 +52,12 @@ class SwUndo
: public SfxUndoAction
{
SwUndoId const m_nId;
- RedlineFlags nOrigRedlineFlags;
+ RedlineFlags m_nOrigRedlineFlags;
ViewShellId const m_nViewShellId;
bool m_isRepeatIgnored; ///< for multi-selection, only repeat 1st selection
protected:
- bool bCacheComment;
+ bool m_bCacheComment;
mutable boost::optional<OUString> maComment;
static void RemoveIdxFromSection( SwDoc&, sal_uLong nSttIdx, const sal_uLong* pEndIdx = nullptr );
@@ -115,8 +115,8 @@ public:
// UndoObject remembers which mode was turned on.
// In Undo/Redo/Repeat this remembered mode is switched on.
- RedlineFlags GetRedlineFlags() const { return nOrigRedlineFlags; }
- void SetRedlineFlags( RedlineFlags eMode ) { nOrigRedlineFlags = eMode; }
+ RedlineFlags GetRedlineFlags() const { return m_nOrigRedlineFlags; }
+ void SetRedlineFlags( RedlineFlags eMode ) { m_nOrigRedlineFlags = eMode; }
bool IsDelBox() const;
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index 83536dba8f31..a005785d51da 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -192,7 +192,7 @@ SwUndoDelete::SwUndoDelete(
m_bFromTableCopy( bCalledByTableCpy )
{
- bCacheComment = false;
+ m_bCacheComment = false;
SwDoc * pDoc = rPam.GetDoc();
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index a07b873c5922..654c75483033 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -157,10 +157,10 @@ void SwUndo::RemoveIdxRel( sal_uLong nIdx, const SwPosition& rPos )
}
SwUndo::SwUndo(SwUndoId const nId, const SwDoc* pDoc)
- : m_nId(nId), nOrigRedlineFlags(RedlineFlags::NONE)
+ : m_nId(nId), m_nOrigRedlineFlags(RedlineFlags::NONE)
, m_nViewShellId(CreateViewShellId(pDoc))
, m_isRepeatIgnored(false)
- , bCacheComment(true)
+ , m_bCacheComment(true)
{
}
@@ -654,7 +654,7 @@ OUString SwUndo::GetComment() const
{
OUString aResult;
- if (bCacheComment)
+ if (m_bCacheComment)
{
if (! maComment)
{
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 1bf8be8a9855..5333588f9fd4 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -100,7 +100,7 @@ void SwUndoInsert::Init(const SwNodeIndex & rNd)
maUndoText = GetTextFromDoc();
- bCacheComment = false;
+ m_bCacheComment = false;
}
SwUndoInsert::SwUndoInsert( const SwNodeIndex& rNd, sal_Int32 nCnt,
diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx
index 6738c5b44314..f4218591a330 100644
--- a/sw/source/core/undo/unovwr.cxx
+++ b/sw/source/core/undo/unovwr.cxx
@@ -92,7 +92,7 @@ SwUndoOverwrite::SwUndoOverwrite( SwDoc* pDoc, SwPosition& rPos,
}
pTextNd->SetIgnoreDontExpand( bOldExpFlg );
- bCacheComment = false;
+ m_bCacheComment = false;
}
SwUndoOverwrite::~SwUndoOverwrite()
diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx
index 725922e26157..8aae3c055b63 100644
--- a/sw/source/core/undo/unredln.cxx
+++ b/sw/source/core/undo/unredln.cxx
@@ -173,7 +173,7 @@ SwUndoRedlineDelete::SwUndoRedlineDelete( const SwPaM& rRange, SwUndoId nUsrId )
}
}
- bCacheComment = false;
+ m_bCacheComment = false;
}
// bit of a hack, replace everything...