summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-05-24 08:14:14 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-05-24 11:49:36 +0000
commit1520d59850f027bace775e6055bb4632667573c3 (patch)
tree8da4726ba08c6bf24c6167576289613dd95651f2 /sw
parent7528fd4491f271f4b0faf1ca5d858bb9fac124ec (diff)
sw: prefix members of SwColumn
Change-Id: I5f7f0ae87a94e7bdb012bd73dea5cbb5115df448 Reviewed-on: https://gerrit.libreoffice.org/25399 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/fmtclds.hxx26
-rw-r--r--sw/source/core/layout/atrfrm.cxx22
2 files changed, 24 insertions, 24 deletions
diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index 2b7fb7f484b9..9938f765231f 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.hxx
@@ -31,28 +31,28 @@
/// ColumnDescriptor
class SwColumn
{
- sal_uInt16 nWish; /**< Desired width, borders included.
+ sal_uInt16 m_nWish; /**< Desired width, borders included.
It is inversely proportional to the ratio of
desired width environment / current width column. */
- sal_uInt16 nUpper; ///< Top border.
- sal_uInt16 nLower; ///< Bottom border.
- sal_uInt16 nLeft; ///< Left border.
- sal_uInt16 nRight; ///< Right border.
+ sal_uInt16 m_nUpper; ///< Top border.
+ sal_uInt16 m_nLower; ///< Bottom border.
+ sal_uInt16 m_nLeft; ///< Left border.
+ sal_uInt16 m_nRight; ///< Right border.
public:
SwColumn();
bool operator==( const SwColumn & ) const;
- void SetWishWidth( sal_uInt16 nNew ) { nWish = nNew; }
- void SetLeft ( sal_uInt16 nNew ) { nLeft = nNew; }
- void SetRight( sal_uInt16 nNew ) { nRight = nNew; }
+ void SetWishWidth( sal_uInt16 nNew ) { m_nWish = nNew; }
+ void SetLeft ( sal_uInt16 nNew ) { m_nLeft = nNew; }
+ void SetRight( sal_uInt16 nNew ) { m_nRight = nNew; }
- sal_uInt16 GetWishWidth() const { return nWish; }
- sal_uInt16 GetUpper() const { return nUpper; }
- sal_uInt16 GetLower() const { return nLower; }
- sal_uInt16 GetLeft () const { return nLeft; }
- sal_uInt16 GetRight() const { return nRight; }
+ sal_uInt16 GetWishWidth() const { return m_nWish; }
+ sal_uInt16 GetUpper() const { return m_nUpper; }
+ sal_uInt16 GetLower() const { return m_nLower; }
+ sal_uInt16 GetLeft () const { return m_nLeft; }
+ sal_uInt16 GetRight() const { return m_nRight; }
void dumpAsXml(struct _xmlTextWriter* pWriter) const;
};
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 4f518262723c..849af3b88ed0 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -779,17 +779,17 @@ void SwFormatPageDesc::dumpAsXml(xmlTextWriterPtr pWriter) const
// Partially implemented inline in hxx
SwColumn::SwColumn() :
- nWish ( 0 ),
- nUpper( 0 ),
- nLower( 0 ),
- nLeft ( 0 ),
- nRight( 0 )
+ m_nWish ( 0 ),
+ m_nUpper( 0 ),
+ m_nLower( 0 ),
+ m_nLeft ( 0 ),
+ m_nRight( 0 )
{
}
bool SwColumn::operator==( const SwColumn &rCmp ) const
{
- return nWish == rCmp.GetWishWidth() &&
+ return m_nWish == rCmp.GetWishWidth() &&
GetLeft() == rCmp.GetLeft() &&
GetRight() == rCmp.GetRight() &&
GetUpper() == rCmp.GetUpper() &&
@@ -799,11 +799,11 @@ bool SwColumn::operator==( const SwColumn &rCmp ) const
void SwColumn::dumpAsXml(xmlTextWriterPtr pWriter) const
{
xmlTextWriterStartElement(pWriter, BAD_CAST("swColumn"));
- xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nWish"), BAD_CAST(OString::number(nWish).getStr()));
- xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nUpper"), BAD_CAST(OString::number(nUpper).getStr()));
- xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nLower"), BAD_CAST(OString::number(nLower).getStr()));
- xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nLeft"), BAD_CAST(OString::number(nLeft).getStr()));
- xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nRight"), BAD_CAST(OString::number(nRight).getStr()));
+ xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nWish"), BAD_CAST(OString::number(m_nWish).getStr()));
+ xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nUpper"), BAD_CAST(OString::number(m_nUpper).getStr()));
+ xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nLower"), BAD_CAST(OString::number(m_nLower).getStr()));
+ xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nLeft"), BAD_CAST(OString::number(m_nLeft).getStr()));
+ xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nRight"), BAD_CAST(OString::number(m_nRight).getStr()));
xmlTextWriterEndElement(pWriter);
}