[Libreoffice-commits] core.git: sw/source
Miklos Vajna
vmiklos at collabora.co.uk
Mon May 30 17:35:53 UTC 2016
sw/source/core/inc/txtfrm.hxx | 4 ++--
sw/source/core/text/txtfrm.cxx | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit aab59c3c17ce16882864fe41056ad6c1c850c953
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon May 30 09:13:39 2016 +0200
sw: prefix members of SwLayoutModeModifier
Change-Id: I280a79f5060623c8a30ecfde99cf650ebde4e5fd
Reviewed-on: https://gerrit.libreoffice.org/25653
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index bd32500..567bd19 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -793,8 +793,8 @@ public:
class SwLayoutModeModifier
{
- const OutputDevice& rOut;
- ComplexTextLayoutMode nOldLayoutMode;
+ const OutputDevice& m_rOut;
+ ComplexTextLayoutMode m_nOldLayoutMode;
public:
SwLayoutModeModifier( const OutputDevice& rOutp );
~SwLayoutModeModifier();
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 1250d4b..1200721 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -288,26 +288,26 @@ void SwTextFrame::SwitchLTRtoRTL( Point& rPoint ) const
}
SwLayoutModeModifier::SwLayoutModeModifier( const OutputDevice& rOutp ) :
- rOut( rOutp ), nOldLayoutMode( rOutp.GetLayoutMode() )
+ m_rOut( rOutp ), m_nOldLayoutMode( rOutp.GetLayoutMode() )
{
}
SwLayoutModeModifier::~SwLayoutModeModifier()
{
- const_cast<OutputDevice&>(rOut).SetLayoutMode( nOldLayoutMode );
+ const_cast<OutputDevice&>(m_rOut).SetLayoutMode( m_nOldLayoutMode );
}
void SwLayoutModeModifier::Modify( bool bChgToRTL )
{
- const_cast<OutputDevice&>(rOut).SetLayoutMode( bChgToRTL ?
+ const_cast<OutputDevice&>(m_rOut).SetLayoutMode( bChgToRTL ?
TEXT_LAYOUT_BIDI_STRONG | TEXT_LAYOUT_BIDI_RTL :
TEXT_LAYOUT_BIDI_STRONG );
}
void SwLayoutModeModifier::SetAuto()
{
- const ComplexTextLayoutMode nNewLayoutMode = nOldLayoutMode & ~TEXT_LAYOUT_BIDI_STRONG;
- const_cast<OutputDevice&>(rOut).SetLayoutMode( nNewLayoutMode );
+ const ComplexTextLayoutMode nNewLayoutMode = m_nOldLayoutMode & ~TEXT_LAYOUT_BIDI_STRONG;
+ const_cast<OutputDevice&>(m_rOut).SetLayoutMode( nNewLayoutMode );
}
SwDigitModeModifier::SwDigitModeModifier( const OutputDevice& rOutp, LanguageType eCurLang ) :
More information about the Libreoffice-commits
mailing list