sw/inc/fmtline.hxx | 12 ++++++------
sw/inc/fmtsrnd.hxx | 18 +++++++++---------
sw/source/core/layout/atrfrm.cxx | 22 +++++++++++-----------
3 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit e1b51d4588b4b39592bb94dd5bb90de5e04d061e
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Sep 23 09:05:13 2019 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Sep 23 10:58:41 2019 +0200
sw: prefix members of SwFormatLineNumber and SwFormatSurround
See tdf#94879 for motivation.
Change-Id: I95e4f867411d5513db0e1b64a37abbba9ef9c2b3
Reviewed-on: https://gerrit.libreoffice.org/79374
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx
index 7c5e393e4794..c0589d53ffed 100644
--- a/sw/inc/fmtline.hxx
+++ b/sw/inc/fmtline.hxx
@@ -29,8 +29,8 @@ class IntlWrapper;
class SW_DLLPUBLIC SwFormatLineNumber: public SfxPoolItem
{
- sal_uLong nStartValue :24; ///< Starting value for the paragraph. 0 ==
no starting value.
- bool bCountLines :1; ///< Also count lines of paragraph.
+ sal_uLong m_nStartValue :24; ///< Starting value for the paragraph. 0 ==
no starting value.
+ bool m_bCountLines :1; ///< Also count lines of paragraph.
public:
SwFormatLineNumber();
@@ -54,11 +54,11 @@ public:
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8
nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8
nMemberId ) override;
- sal_uLong GetStartValue() const { return nStartValue; }
- bool IsCount() const { return bCountLines; }
+ sal_uLong GetStartValue() const { return m_nStartValue; }
+ bool IsCount() const { return m_bCountLines; }
- void SetStartValue( sal_uLong nNew ) { nStartValue = nNew; }
- void SetCountLines( bool b ) { bCountLines = b; }
+ void SetStartValue( sal_uLong nNew ) { m_nStartValue = nNew; }
+ void SetCountLines( bool b ) { m_bCountLines = b; }
};
inline const SwFormatLineNumber &SwAttrSet::GetLineNumber(bool bInP) const
diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx
index 264e0517da12..30bd3f0a2610 100644
--- a/sw/inc/fmtsrnd.hxx
+++ b/sw/inc/fmtsrnd.hxx
@@ -30,9 +30,9 @@ class IntlWrapper;
// SwFormatSurround: How document content under the frame shall behave.
class SW_DLLPUBLIC SwFormatSurround: public
SfxEnumItem<css::text::WrapTextMode>
{
- bool bAnchorOnly :1;
- bool bContour :1;
- bool bOutside :1;
+ bool m_bAnchorOnly :1;
+ bool m_bContour :1;
+ bool m_bOutside :1;
public:
SwFormatSurround( css::text::WrapTextMode eNew =
css::text::WrapTextMode_PARALLEL );
@@ -49,13 +49,13 @@ public:
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8
nMemberId ) override;
css::text::WrapTextMode GetSurround() const { return GetValue(); }
- bool IsAnchorOnly() const { return bAnchorOnly; }
- bool IsContour() const { return bContour; }
- bool IsOutside() const { return bOutside; }
+ bool IsAnchorOnly() const { return m_bAnchorOnly; }
+ bool IsContour() const { return m_bContour; }
+ bool IsOutside() const { return m_bOutside; }
void SetSurround ( css::text::WrapTextMode eNew ) { SetValue( eNew ); }
- void SetAnchorOnly( bool bNew ) { bAnchorOnly = bNew; }
- void SetContour( bool bNew ) { bContour = bNew; }
- void SetOutside( bool bNew ) { bOutside = bNew; }
+ void SetAnchorOnly( bool bNew ) { m_bAnchorOnly = bNew; }
+ void SetContour( bool bNew ) { m_bContour = bNew; }
+ void SetOutside( bool bNew ) { m_bOutside = bNew; }
void dumpAsXml(xmlTextWriterPtr pWriter) const override;
};
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 4c4e494708f1..41a4e79655ec 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -1164,16 +1164,16 @@ void SwFormatCol::dumpAsXml(xmlTextWriterPtr pWriter)
const
SwFormatSurround::SwFormatSurround( css::text::WrapTextMode eFly ) :
SfxEnumItem( RES_SURROUND, eFly )
{
- bAnchorOnly = bContour = bOutside = false;
+ m_bAnchorOnly = m_bContour = m_bOutside = false;
}
bool SwFormatSurround::operator==( const SfxPoolItem& rAttr ) const
{
assert(SfxPoolItem::operator==(rAttr));
return ( GetValue() == static_cast<const
SwFormatSurround&>(rAttr).GetValue() &&
- bAnchorOnly== static_cast<const
SwFormatSurround&>(rAttr).bAnchorOnly &&
- bContour== static_cast<const SwFormatSurround&>(rAttr).bContour &&
- bOutside== static_cast<const SwFormatSurround&>(rAttr).bOutside );
+ m_bAnchorOnly== static_cast<const
SwFormatSurround&>(rAttr).m_bAnchorOnly &&
+ m_bContour== static_cast<const
SwFormatSurround&>(rAttr).m_bContour &&
+ m_bOutside== static_cast<const
SwFormatSurround&>(rAttr).m_bOutside );
}
SfxPoolItem* SwFormatSurround::Clone( SfxItemPool* ) const
@@ -1258,9 +1258,9 @@ void SwFormatSurround::dumpAsXml(xmlTextWriterPtr
pWriter) const
GetPresentation(SfxItemPresentation::Nameless, MapUnit::Map100thMM,
MapUnit::Map100thMM, aPresentation, aIntlWrapper);
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("presentation"),
BAD_CAST(aPresentation.toUtf8().getStr()));
- xmlTextWriterWriteAttribute(pWriter, BAD_CAST("bAnchorOnly"),
BAD_CAST(OString::boolean(bAnchorOnly).getStr()));
- xmlTextWriterWriteAttribute(pWriter, BAD_CAST("bContour"),
BAD_CAST(OString::boolean(bContour).getStr()));
- xmlTextWriterWriteAttribute(pWriter, BAD_CAST("bOutside"),
BAD_CAST(OString::boolean(bOutside).getStr()));
+ xmlTextWriterWriteAttribute(pWriter, BAD_CAST("bAnchorOnly"),
BAD_CAST(OString::boolean(m_bAnchorOnly).getStr()));
+ xmlTextWriterWriteAttribute(pWriter, BAD_CAST("bContour"),
BAD_CAST(OString::boolean(m_bContour).getStr()));
+ xmlTextWriterWriteAttribute(pWriter, BAD_CAST("bOutside"),
BAD_CAST(OString::boolean(m_bOutside).getStr()));
xmlTextWriterEndElement(pWriter);
}
@@ -2073,8 +2073,8 @@ bool SwFormatChain::QueryValue( uno::Any& rVal, sal_uInt8
nMemberId ) const
SwFormatLineNumber::SwFormatLineNumber() :
SfxPoolItem( RES_LINENUMBER )
{
- nStartValue = 0;
- bCountLines = true;
+ m_nStartValue = 0;
+ m_bCountLines = true;
}
SwFormatLineNumber::~SwFormatLineNumber()
@@ -2085,8 +2085,8 @@ bool SwFormatLineNumber::operator==( const SfxPoolItem
&rAttr ) const
{
assert(SfxPoolItem::operator==(rAttr));
- return nStartValue == static_cast<const
SwFormatLineNumber&>(rAttr).GetStartValue() &&
- bCountLines == static_cast<const
SwFormatLineNumber&>(rAttr).IsCount();
+ return m_nStartValue == static_cast<const
SwFormatLineNumber&>(rAttr).GetStartValue() &&
+ m_bCountLines == static_cast<const
SwFormatLineNumber&>(rAttr).IsCount();
}
SfxPoolItem* SwFormatLineNumber::Clone( SfxItemPool* ) const
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
