sw/source/core/inc/txtfrm.hxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
New commits: commit a029fd42907bf617a26cdfe4278b191b0a34de8b Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Mon Jul 3 08:04:02 2017 +0200 sw: prefix members of TemporarySwap Change-Id: I7792ccb06d25a532605ff8eee1bffe17d41c6ad5 diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index 66d694d59dba..e8a20b7dd72e 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -742,17 +742,17 @@ inline void SwTextFrame::ResetBlinkPor() const class TemporarySwap { protected: explicit TemporarySwap(SwTextFrame * frame, bool swap): - frame_(frame), undo_(false) + m_frame(frame), m_undo(false) { - if (frame_->IsVertical() && swap) { - undo_ = true; - frame_->SwapWidthAndHeight(); + if (m_frame->IsVertical() && swap) { + m_undo = true; + m_frame->SwapWidthAndHeight(); } } ~TemporarySwap() { - if (undo_) { - frame_->SwapWidthAndHeight(); + if (m_undo) { + m_frame->SwapWidthAndHeight(); } } @@ -760,8 +760,8 @@ private: TemporarySwap(TemporarySwap &) = delete; void operator =(TemporarySwap &) = delete; - SwTextFrame * frame_; - bool undo_; + SwTextFrame * m_frame; + bool m_undo; }; class SwSwapIfSwapped: private TemporarySwap { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits