[Libreoffice-commits] core.git: 4 commits - sw/inc sw/source
Miklos Vajna
vmiklos at collabora.co.uk
Wed Oct 28 01:06:40 PDT 2015
sw/inc/swtable.hxx | 18 +++---
sw/inc/tox.hxx | 74 ++++++++++++-------------
sw/source/core/fields/cellfml.cxx | 4 -
sw/source/core/inc/swfont.hxx | 112 +++++++++++++++++++-------------------
sw/source/core/table/swtable.cxx | 66 +++++++++++-----------
sw/source/core/tox/tox.cxx | 48 ++++++++--------
sw/source/core/txtnode/atrtox.cxx | 2
sw/source/core/txtnode/fntcap.cxx | 2
sw/source/core/txtnode/swfont.cxx | 92 +++++++++++++++----------------
sw/source/filter/xml/xmltbli.cxx | 4 -
10 files changed, 211 insertions(+), 211 deletions(-)
New commits:
commit a827957f3f559738c221450e3e691361096ac9a4
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed Oct 28 09:05:24 2015 +0100
sw: prefix members of SwSubFont
Change-Id: Ifc4ec214ad7034ecf694c690c3a04e995c64fbe9
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 960f5bd..3607fb2 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -49,15 +49,15 @@ sal_uInt16 UnMapDirection( sal_uInt16 nDir, const bool bVertFormat );
class SwSubFont : public SvxFont
{
friend class SwFont;
- const void *pMagic; // "MagicNumber" within the font cache
- Size aSize; // foreigners only see this size
- sal_uInt16 nFntIndex; // index in the font cache
- sal_uInt16 nOrgHeight; // height including escapement/proportion
- sal_uInt16 nOrgAscent; // ascent including escapement/proportion
- sal_uInt16 nPropWidth; // proportional width
- bool smallCapsPercentage66;
- inline SwSubFont() : aSize(0,0)
- { pMagic = NULL; nFntIndex = nOrgHeight = nOrgAscent = 0; nPropWidth =100; smallCapsPercentage66 = false; }
+ const void *m_pMagic; // "MagicNumber" within the font cache
+ Size m_aSize; // foreigners only see this size
+ sal_uInt16 m_nFontIndex; // index in the font cache
+ sal_uInt16 m_nOrgHeight; // height including escapement/proportion
+ sal_uInt16 m_nOrgAscent; // ascent including escapement/proportion
+ sal_uInt16 m_nProportionalWidth; // proportional width
+ bool m_bSmallCapsPercentage66;
+ inline SwSubFont() : m_aSize(0,0)
+ { m_pMagic = NULL; m_nFontIndex = m_nOrgHeight = m_nOrgAscent = 0; m_nProportionalWidth =100; m_bSmallCapsPercentage66 = false; }
sal_uInt16 CalcEscAscent( const sal_uInt16 nOldAscent ) const;
sal_uInt16 CalcEscHeight( const sal_uInt16 nOldHeight,
@@ -112,9 +112,9 @@ class SwSubFont : public SvxFont
inline short CheckKerning()
{ return GetFixKerning() >= 0 ? GetFixKerning() : _CheckKerning( ); }
inline void SetPropWidth( const sal_uInt16 nNew )
- { pMagic = 0; nPropWidth = nNew; }
+ { m_pMagic = 0; m_nProportionalWidth = nNew; }
public:
- sal_uInt16 GetPropWidth() const { return nPropWidth; }
+ sal_uInt16 GetPropWidth() const { return m_nProportionalWidth; }
};
#define SW_LATIN 0
@@ -191,17 +191,17 @@ public:
const Color& GetHighlightColor() const { return m_aHighlightColor; }
inline void ChkMagic( SwViewShell *pSh, sal_uInt8 nWhich )
- { if( !m_aSub[ nWhich ].pMagic ) GoMagic( pSh, nWhich ); }
+ { if( !m_aSub[ nWhich ].m_pMagic ) GoMagic( pSh, nWhich ); }
inline void GetMagic( const void* &rMagic, sal_uInt16 &rIdx, sal_uInt8 nWhich )
- { rMagic = m_aSub[nWhich].pMagic; rIdx = m_aSub[nWhich].nFntIndex; }
+ { rMagic = m_aSub[nWhich].m_pMagic; rIdx = m_aSub[nWhich].m_nFontIndex; }
inline void SetMagic( const void* pNew, const sal_uInt16 nIdx, sal_uInt8 nWhich )
- { m_aSub[nWhich].pMagic = pNew; m_aSub[nWhich].nFntIndex = nIdx; }
+ { m_aSub[nWhich].m_pMagic = pNew; m_aSub[nWhich].m_nFontIndex = nIdx; }
inline bool DifferentMagic( const SwFont* pFnt, sal_uInt8 nWhich )
- { return m_aSub[nWhich].pMagic != pFnt->m_aSub[nWhich].pMagic ||
- !m_aSub[nWhich].pMagic || !pFnt->m_aSub[nWhich].pMagic; }
+ { return m_aSub[nWhich].m_pMagic != pFnt->m_aSub[nWhich].m_pMagic ||
+ !m_aSub[nWhich].m_pMagic || !pFnt->m_aSub[nWhich].m_pMagic; }
inline const Size &GetSize( sal_uInt8 nWhich ) const
- { return m_aSub[nWhich].aSize; }
+ { return m_aSub[nWhich].m_aSize; }
inline bool IsFntChg() const { return m_bFontChg; }
inline void SetFntChg( const bool bNew ) { m_bFontChg = bNew; }
@@ -413,14 +413,14 @@ inline void SwFont::SetColor( const Color& rColor )
// encapsulated SV-Font-method
inline void SwSubFont::SetColor( const Color& rColor )
{
- pMagic = 0;
+ m_pMagic = 0;
Font::SetColor( rColor );
}
// encapsulated SV-Font-method
inline void SwSubFont::SetFillColor( const Color& rColor )
{
- pMagic = 0;
+ m_pMagic = 0;
Font::SetFillColor( rColor );
}
@@ -435,7 +435,7 @@ inline void SwFont::SetFillColor( const Color& rColor )
// encapsulated SV-Font-method
inline void SwSubFont::SetFamily( const FontFamily eFamily )
{
- pMagic = 0;
+ m_pMagic = 0;
Font::SetFamily( eFamily );
}
@@ -448,7 +448,7 @@ inline void SwFont::SetFamily( const FontFamily eFamily, const sal_uInt8 nWhich
// encapsulated SV-Font-method
inline void SwSubFont::SetName( const OUString& rName )
{
- pMagic = 0;
+ m_pMagic = 0;
Font::SetName( rName );
}
@@ -461,7 +461,7 @@ inline void SwFont::SetName( const OUString& rName, const sal_uInt8 nWhich )
// encapsulated SV-Font-method
inline void SwSubFont::SetStyleName( const OUString& rStyleName )
{
- pMagic = 0;
+ m_pMagic = 0;
Font::SetStyleName( rStyleName );
}
@@ -474,7 +474,7 @@ inline void SwFont::SetStyleName( const OUString& rStyle, const sal_uInt8 nWhich
// encapsulated SV-Font-method
inline void SwSubFont::SetCharSet( const rtl_TextEncoding eCharSet )
{
- pMagic = 0;
+ m_pMagic = 0;
Font::SetCharSet( eCharSet );
}
@@ -487,7 +487,7 @@ inline void SwFont::SetCharSet( const rtl_TextEncoding eCharSet, const sal_uInt8
// encapsulated SV-Font-method
inline void SwSubFont::SetPitch( const FontPitch ePitch )
{
- pMagic = 0;
+ m_pMagic = 0;
Font::SetPitch( ePitch );
}
@@ -501,7 +501,7 @@ inline void SwFont::SetPitch( const FontPitch ePitch, const sal_uInt8 nWhich )
// encapsulated SV-Font-method
inline void SwSubFont::SetAlign( const FontAlign eAlign )
{
- pMagic = 0;
+ m_pMagic = 0;
Font::SetAlign( eAlign );
}
@@ -516,7 +516,7 @@ inline void SwFont::SetAlign( const FontAlign eAlign )
// encapsulated SV-Font-method
inline void SwSubFont::SetWeight( const FontWeight eWeight )
{
- pMagic = 0;
+ m_pMagic = 0;
Font::SetWeight( eWeight );
}
@@ -529,7 +529,7 @@ inline void SwFont::SetWeight( const FontWeight eWeight, const sal_uInt8 nWhich
// encapsulated SV-Font-method
inline void SwSubFont::SetUnderline( const FontUnderline eUnderline )
{
- pMagic = 0;
+ m_pMagic = 0;
Font::SetUnderline( eUnderline );
}
@@ -544,7 +544,7 @@ inline void SwFont::SetUnderline( const FontUnderline eUnderline )
// encapsulated SV-Font-method
inline void SwSubFont::SetOverline( const FontUnderline eOverline )
{
- pMagic = 0;
+ m_pMagic = 0;
Font::SetOverline( eOverline );
}
@@ -559,7 +559,7 @@ inline void SwFont::SetOverline( const FontUnderline eOverline )
// encapsulated SV-Font-method
inline void SwSubFont::SetStrikeout( const FontStrikeout eStrikeout )
{
- pMagic = 0;
+ m_pMagic = 0;
Font::SetStrikeout( eStrikeout );
}
@@ -574,7 +574,7 @@ inline void SwFont::SetStrikeout( const FontStrikeout eStrikeout )
// encapsulated SV-Font-method
inline void SwSubFont::SetItalic( const FontItalic eItalic )
{
- pMagic = 0;
+ m_pMagic = 0;
Font::SetItalic( eItalic );
}
@@ -587,7 +587,7 @@ inline void SwFont::SetItalic( const FontItalic eItalic, const sal_uInt8 nWhich
// encapsulated SV-Font-method
inline void SwSubFont::SetOutline( const bool bOutline )
{
- pMagic = 0;
+ m_pMagic = 0;
Font::SetOutline( bOutline );
}
@@ -602,7 +602,7 @@ inline void SwFont::SetOutline( const bool bOutline )
// encapsulated SV-Font-method
inline void SwSubFont::SetShadow( const bool bShadow )
{
- pMagic = 0;
+ m_pMagic = 0;
Font::SetShadow( bShadow );
}
@@ -617,7 +617,7 @@ inline void SwFont::SetShadow( const bool bShadow )
// encapsulated SV-Font-method
inline void SwSubFont::SetAutoKern( FontKerning nAutoKern )
{
- pMagic = 0;
+ m_pMagic = 0;
Font::SetKerning( nAutoKern );
}
@@ -655,7 +655,7 @@ inline void SwFont::SetCaseMap( const SvxCaseMap eNew )
// encapsulated SV-Font-method
inline void SwSubFont::SetWordLineMode( const bool bWordLineMode )
{
- pMagic = 0;
+ m_pMagic = 0;
Font::SetWordLineMode( bWordLineMode );
}
@@ -669,7 +669,7 @@ inline void SwFont::SetWordLineMode( const bool bWordLineMode )
// encapsulated SV-Font-method
inline void SwSubFont::SetEmphasisMark( const FontEmphasisMark eValue )
{
- pMagic = 0;
+ m_pMagic = 0;
Font::SetEmphasisMark( eValue );
}
@@ -695,7 +695,7 @@ inline void SwFont::SetPropWidth( const sal_uInt16 nNew )
// encapsulated SV-Font-method
inline void SwSubFont::SetRelief( const FontRelief eNew )
{
- pMagic = 0;
+ m_pMagic = 0;
Font::SetRelief( eNew );
}
@@ -713,21 +713,21 @@ inline void SwFont::SetRelief( const FontRelief eNew )
// overloaded font-method
inline void SwSubFont::SetSize( const Size& rSize )
{
- aSize = rSize;
+ m_aSize = rSize;
if ( GetPropr() == 100 )
- Font::SetSize( aSize );
+ Font::SetSize( m_aSize );
else
{
Font::SetSize( Size(
- (long) aSize.Width() * GetPropr() / 100L,
- (long) aSize.Height() * GetPropr() / 100L ) );
+ (long) m_aSize.Width() * GetPropr() / 100L,
+ (long) m_aSize.Height() * GetPropr() / 100L ) );
}
- pMagic = 0;
+ m_pMagic = 0;
}
inline void SwFont::SetSize( const Size& rSize, const sal_uInt8 nWhich )
{
- if( m_aSub[nWhich].aSize != rSize )
+ if( m_aSub[nWhich].m_aSize != rSize )
{
m_aSub[nWhich].SetSize( rSize );
m_bFontChg = true;
@@ -747,9 +747,9 @@ inline void SwFont::SetActual( sal_uInt8 nNew )
inline void SwSubFont::SetProportion( const sal_uInt8 nNewPropr )
{
- pMagic = 0;
- Font::SetSize( Size( (long) aSize.Width() * nNewPropr / 100L,
- (long) aSize.Height() * nNewPropr / 100L ) );
+ m_pMagic = 0;
+ Font::SetSize( Size( (long) m_aSize.Width() * nNewPropr / 100L,
+ (long) m_aSize.Height() * nNewPropr / 100L ) );
SvxFont::SetPropr( nNewPropr );
}
@@ -768,7 +768,7 @@ inline void SwFont::SetProportion( const sal_uInt8 nNewPropr )
inline void SwSubFont::SetEscapement( const short nNewEsc )
{
- pMagic = 0;
+ m_pMagic = 0;
SvxFont::SetEscapement( nNewEsc );
}
@@ -789,7 +789,7 @@ inline void SwFont::SetEscapement( const short nNewEsc )
inline void SwSubFont::SetLanguage( LanguageType eNewLang )
{
- pMagic = 0;
+ m_pMagic = 0;
if( eNewLang == LANGUAGE_SYSTEM )
eNewLang = (LanguageType)GetAppLanguage();
SvxFont::SetLanguage( eNewLang );
@@ -828,7 +828,7 @@ inline void SwFont::SetNoCol( const bool bNew )
inline void SwSubFont::SetVertical( const sal_uInt16 nDir, const bool bVertFormat )
{
- pMagic = 0;
+ m_pMagic = 0;
Font::SetVertical( bVertFormat );
Font::SetOrientation( nDir );
}
@@ -837,28 +837,28 @@ inline void SwFont::SetTopBorderDist( const sal_uInt16 nTopDist )
{
m_nTopBorderDist = nTopDist;
m_bFontChg = true;
- m_aSub[SW_LATIN].pMagic = m_aSub[SW_CJK].pMagic = m_aSub[SW_CTL].pMagic = 0;
+ m_aSub[SW_LATIN].m_pMagic = m_aSub[SW_CJK].m_pMagic = m_aSub[SW_CTL].m_pMagic = 0;
}
inline void SwFont::SetBottomBorderDist( const sal_uInt16 nBottomDist )
{
m_nBottomBorderDist = nBottomDist;
m_bFontChg = true;
- m_aSub[SW_LATIN].pMagic = m_aSub[SW_CJK].pMagic = m_aSub[SW_CTL].pMagic = 0;
+ m_aSub[SW_LATIN].m_pMagic = m_aSub[SW_CJK].m_pMagic = m_aSub[SW_CTL].m_pMagic = 0;
}
inline void SwFont::SetRightBorderDist( const sal_uInt16 nRightDist )
{
m_nRightBorderDist = nRightDist;
m_bFontChg = true;
- m_aSub[SW_LATIN].pMagic = m_aSub[SW_CJK].pMagic = m_aSub[SW_CTL].pMagic = 0;
+ m_aSub[SW_LATIN].m_pMagic = m_aSub[SW_CJK].m_pMagic = m_aSub[SW_CTL].m_pMagic = 0;
}
inline void SwFont::SetLeftBorderDist( const sal_uInt16 nLeftDist )
{
m_nLeftBorderDist = nLeftDist;
m_bFontChg = true;
- m_aSub[SW_LATIN].pMagic = m_aSub[SW_CJK].pMagic = m_aSub[SW_CTL].pMagic = 0;
+ m_aSub[SW_LATIN].m_pMagic = m_aSub[SW_CJK].m_pMagic = m_aSub[SW_CTL].m_pMagic = 0;
}
inline sal_uInt16 SwFont::GetTopBorderSpace() const
@@ -930,28 +930,28 @@ inline void SwFont::SetShadowColor( const Color& rColor )
{
m_aShadowColor = rColor;
m_bFontChg = true;
- m_aSub[SW_LATIN].pMagic = m_aSub[SW_CJK].pMagic = m_aSub[SW_CTL].pMagic = 0;
+ m_aSub[SW_LATIN].m_pMagic = m_aSub[SW_CJK].m_pMagic = m_aSub[SW_CTL].m_pMagic = 0;
}
inline void SwFont::SetShadowWidth( const sal_uInt16 nWidth )
{
m_nShadowWidth = nWidth;
m_bFontChg = true;
- m_aSub[SW_LATIN].pMagic = m_aSub[SW_CJK].pMagic = m_aSub[SW_CTL].pMagic = 0;
+ m_aSub[SW_LATIN].m_pMagic = m_aSub[SW_CJK].m_pMagic = m_aSub[SW_CTL].m_pMagic = 0;
}
inline void SwFont::SetShadowLocation( const SvxShadowLocation aLocation )
{
m_aShadowLocation = aLocation;
m_bFontChg = true;
- m_aSub[SW_LATIN].pMagic = m_aSub[SW_CJK].pMagic = m_aSub[SW_CTL].pMagic = 0;
+ m_aSub[SW_LATIN].m_pMagic = m_aSub[SW_CJK].m_pMagic = m_aSub[SW_CTL].m_pMagic = 0;
}
inline void SwFont::SetHighlightColor( const Color& aNewColor )
{
m_aHighlightColor = aNewColor;
m_bFontChg = true;
- m_aSub[SW_LATIN].pMagic = m_aSub[SW_CJK].pMagic = m_aSub[SW_CTL].pMagic = 0;
+ m_aSub[SW_LATIN].m_pMagic = m_aSub[SW_CJK].m_pMagic = m_aSub[SW_CTL].m_pMagic = 0;
}
// Used for the "continuous underline" feature.
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index acc88ec..ab0c97b 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -536,7 +536,7 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo )
// NOTE: There are more uses of SMALL_CAPS_PERCENTAGE in editeng, but it seems they
// do not matter for Writer (and if they did it'd be pretty ugly to propagate
// the option there).
- int smallCapsPercentage = smallCapsPercentage66 ? 66 : SMALL_CAPS_PERCENTAGE;
+ int smallCapsPercentage = m_bSmallCapsPercentage66 ? 66 : SMALL_CAPS_PERCENTAGE;
aFont.SetProportion( (aFont.GetPropr() * smallCapsPercentage ) / 100 );
pMagic2 = NULL;
nIndex2 = 0;
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index 074dbfe..4a0c63f 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -72,7 +72,7 @@ void SwFont::SetBackColor( Color* pNewColor )
delete m_pBackColor;
m_pBackColor = pNewColor;
m_bFontChg = true;
- m_aSub[SW_LATIN].pMagic = m_aSub[SW_CJK].pMagic = m_aSub[SW_CTL].pMagic = 0;
+ m_aSub[SW_LATIN].m_pMagic = m_aSub[SW_CJK].m_pMagic = m_aSub[SW_CTL].m_pMagic = 0;
}
void SwFont::SetTopBorder( const editeng::SvxBorderLine* pTopBorder )
@@ -85,7 +85,7 @@ void SwFont::SetTopBorder( const editeng::SvxBorderLine* pTopBorder )
m_nTopBorderDist = 0;
}
m_bFontChg = true;
- m_aSub[SW_LATIN].pMagic = m_aSub[SW_CJK].pMagic = m_aSub[SW_CTL].pMagic = 0;
+ m_aSub[SW_LATIN].m_pMagic = m_aSub[SW_CJK].m_pMagic = m_aSub[SW_CTL].m_pMagic = 0;
}
void SwFont::SetBottomBorder( const editeng::SvxBorderLine* pBottomBorder )
@@ -98,7 +98,7 @@ void SwFont::SetBottomBorder( const editeng::SvxBorderLine* pBottomBorder )
m_nBottomBorderDist = 0;
}
m_bFontChg = true;
- m_aSub[SW_LATIN].pMagic = m_aSub[SW_CJK].pMagic = m_aSub[SW_CTL].pMagic = 0;
+ m_aSub[SW_LATIN].m_pMagic = m_aSub[SW_CJK].m_pMagic = m_aSub[SW_CTL].m_pMagic = 0;
}
void SwFont::SetRightBorder( const editeng::SvxBorderLine* pRightBorder )
@@ -111,7 +111,7 @@ void SwFont::SetRightBorder( const editeng::SvxBorderLine* pRightBorder )
m_nRightBorderDist = 0;
}
m_bFontChg = true;
- m_aSub[SW_LATIN].pMagic = m_aSub[SW_CJK].pMagic = m_aSub[SW_CTL].pMagic = 0;
+ m_aSub[SW_LATIN].m_pMagic = m_aSub[SW_CJK].m_pMagic = m_aSub[SW_CTL].m_pMagic = 0;
}
void SwFont::SetLeftBorder( const editeng::SvxBorderLine* pLeftBorder )
@@ -124,7 +124,7 @@ void SwFont::SetLeftBorder( const editeng::SvxBorderLine* pLeftBorder )
m_nLeftBorderDist = 0;
}
m_bFontChg = true;
- m_aSub[SW_LATIN].pMagic = m_aSub[SW_CJK].pMagic = m_aSub[SW_CTL].pMagic = 0;
+ m_aSub[SW_LATIN].m_pMagic = m_aSub[SW_CJK].m_pMagic = m_aSub[SW_CTL].m_pMagic = 0;
}
const boost::optional<editeng::SvxBorderLine>&
@@ -471,11 +471,11 @@ sal_uInt16 SwSubFont::CalcEscAscent( const sal_uInt16 nOldAscent ) const
DFLT_ESC_AUTO_SUB != GetEscapement() )
{
const long nAscent = nOldAscent +
- ( (long) nOrgHeight * GetEscapement() ) / 100L;
+ ( (long) m_nOrgHeight * GetEscapement() ) / 100L;
if ( nAscent>0 )
- return std::max<sal_uInt16>( nAscent, nOrgAscent );
+ return std::max<sal_uInt16>( nAscent, m_nOrgAscent );
}
- return nOrgAscent;
+ return m_nOrgAscent;
}
void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet,
@@ -502,8 +502,8 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet,
{
const SvxFontHeightItem *pHeight = static_cast<const SvxFontHeightItem *>(pItem);
m_aSub[SW_LATIN].SvxFont::SetPropr( 100 );
- m_aSub[SW_LATIN].aSize = m_aSub[SW_LATIN].Font::GetSize();
- Size aTmpSize = m_aSub[SW_LATIN].aSize;
+ m_aSub[SW_LATIN].m_aSize = m_aSub[SW_LATIN].Font::GetSize();
+ Size aTmpSize = m_aSub[SW_LATIN].m_aSize;
aTmpSize.Height() = pHeight->GetHeight();
m_aSub[SW_LATIN].SetSize( aTmpSize );
}
@@ -532,8 +532,8 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet,
{
const SvxFontHeightItem *pHeight = static_cast<const SvxFontHeightItem *>(pItem);
m_aSub[SW_CJK].SvxFont::SetPropr( 100 );
- m_aSub[SW_CJK].aSize = m_aSub[SW_CJK].Font::GetSize();
- Size aTmpSize = m_aSub[SW_CJK].aSize;
+ m_aSub[SW_CJK].m_aSize = m_aSub[SW_CJK].Font::GetSize();
+ Size aTmpSize = m_aSub[SW_CJK].m_aSize;
aTmpSize.Height() = pHeight->GetHeight();
m_aSub[SW_CJK].SetSize( aTmpSize );
}
@@ -568,8 +568,8 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet,
{
const SvxFontHeightItem *pHeight = static_cast<const SvxFontHeightItem *>(pItem);
m_aSub[SW_CTL].SvxFont::SetPropr( 100 );
- m_aSub[SW_CTL].aSize = m_aSub[SW_CTL].Font::GetSize();
- Size aTmpSize = m_aSub[SW_CTL].aSize;
+ m_aSub[SW_CTL].m_aSize = m_aSub[SW_CTL].Font::GetSize();
+ Size aTmpSize = m_aSub[SW_CTL].m_aSize;
aTmpSize.Height() = pHeight->GetHeight();
m_aSub[SW_CTL].SetSize( aTmpSize );
}
@@ -763,7 +763,7 @@ SwFont::SwFont( const SwAttrSet* pAttrSet,
m_aSub[SW_LATIN].SetPitch( rFont.GetPitch() );
m_aSub[SW_LATIN].SetCharSet( rFont.GetCharSet() );
m_aSub[SW_LATIN].SvxFont::SetPropr( 100 ); // 100% der FontSize
- Size aTmpSize = m_aSub[SW_LATIN].aSize;
+ Size aTmpSize = m_aSub[SW_LATIN].m_aSize;
aTmpSize.Height() = pAttrSet->GetSize().GetHeight();
m_aSub[SW_LATIN].SetSize( aTmpSize );
m_aSub[SW_LATIN].SetItalic( pAttrSet->GetPosture().GetPosture() );
@@ -779,7 +779,7 @@ SwFont::SwFont( const SwAttrSet* pAttrSet,
m_aSub[SW_CJK].SetPitch( rFont.GetPitch() );
m_aSub[SW_CJK].SetCharSet( rFont.GetCharSet() );
m_aSub[SW_CJK].SvxFont::SetPropr( 100 ); // 100% der FontSize
- Size aTmpSize = m_aSub[SW_CJK].aSize;
+ Size aTmpSize = m_aSub[SW_CJK].m_aSize;
aTmpSize.Height() = pAttrSet->GetCJKSize().GetHeight();
m_aSub[SW_CJK].SetSize( aTmpSize );
m_aSub[SW_CJK].SetItalic( pAttrSet->GetCJKPosture().GetPosture() );
@@ -799,7 +799,7 @@ SwFont::SwFont( const SwAttrSet* pAttrSet,
m_aSub[SW_CTL].SetPitch( rFont.GetPitch() );
m_aSub[SW_CTL].SetCharSet( rFont.GetCharSet() );
m_aSub[SW_CTL].SvxFont::SetPropr( 100 ); // 100% der FontSize
- Size aTmpSize = m_aSub[SW_CTL].aSize;
+ Size aTmpSize = m_aSub[SW_CTL].m_aSize;
aTmpSize.Height() = pAttrSet->GetCTLSize().GetHeight();
m_aSub[SW_CTL].SetSize( aTmpSize );
m_aSub[SW_CTL].SetItalic( pAttrSet->GetCTLPosture().GetPosture() );
@@ -896,9 +896,9 @@ SwFont::SwFont( const SwAttrSet* pAttrSet,
SetVertical( 0 );
if( pIDocumentSettingAccess && pIDocumentSettingAccess->get( DocumentSettingId::SMALL_CAPS_PERCENTAGE_66 ))
{
- m_aSub[ SW_LATIN ].smallCapsPercentage66 = true;
- m_aSub[ SW_CJK ].smallCapsPercentage66 = true;
- m_aSub[ SW_CTL ].smallCapsPercentage66 = true;
+ m_aSub[ SW_LATIN ].m_bSmallCapsPercentage66 = true;
+ m_aSub[ SW_CJK ].m_bSmallCapsPercentage66 = true;
+ m_aSub[ SW_CTL ].m_bSmallCapsPercentage66 = true;
}
}
@@ -910,13 +910,13 @@ SwFont::~SwFont()
SwSubFont& SwSubFont::operator=( const SwSubFont &rFont )
{
SvxFont::operator=( rFont );
- pMagic = rFont.pMagic;
- nFntIndex = rFont.nFntIndex;
- nOrgHeight = rFont.nOrgHeight;
- nOrgAscent = rFont.nOrgAscent;
- nPropWidth = rFont.nPropWidth;
- aSize = rFont.aSize;
- smallCapsPercentage66 = rFont.smallCapsPercentage66;
+ m_pMagic = rFont.m_pMagic;
+ m_nFontIndex = rFont.m_nFontIndex;
+ m_nOrgHeight = rFont.m_nOrgHeight;
+ m_nOrgAscent = rFont.m_nOrgAscent;
+ m_nProportionalWidth = rFont.m_nProportionalWidth;
+ m_aSize = rFont.m_aSize;
+ m_bSmallCapsPercentage66 = rFont.m_bSmallCapsPercentage66;
return *this;
}
@@ -960,13 +960,13 @@ SwFont& SwFont::operator=( const SwFont &rFont )
void SwFont::GoMagic( SwViewShell *pSh, sal_uInt8 nWhich )
{
- SwFntAccess aFntAccess( m_aSub[nWhich].pMagic, m_aSub[nWhich].nFntIndex,
+ SwFntAccess aFntAccess( m_aSub[nWhich].m_pMagic, m_aSub[nWhich].m_nFontIndex,
&m_aSub[nWhich], pSh, true );
}
bool SwSubFont::IsSymbol( SwViewShell *pSh )
{
- SwFntAccess aFntAccess( pMagic, nFntIndex, this, pSh, false );
+ SwFntAccess aFntAccess( m_pMagic, m_nFontIndex, this, pSh, false );
return aFntAccess.Get()->IsSymbol();
}
@@ -974,7 +974,7 @@ bool SwSubFont::ChgFnt( SwViewShell const *pSh, OutputDevice& rOut )
{
if ( pLastFont )
pLastFont->Unlock();
- SwFntAccess aFntAccess( pMagic, nFntIndex, this, pSh, true );
+ SwFntAccess aFntAccess( m_pMagic, m_nFontIndex, this, pSh, true );
SV_STAT( nChangeFont );
pLastFont = aFntAccess.Get();
@@ -994,10 +994,10 @@ void SwFont::ChgPhysFnt( SwViewShell *pSh, OutputDevice& rOut )
const sal_uInt8 nOldProp = m_aSub[m_nActual].GetPropr();
SetProportion( 100 );
ChgFnt( pSh, rOut );
- SwFntAccess aFntAccess( m_aSub[m_nActual].pMagic, m_aSub[m_nActual].nFntIndex,
+ SwFntAccess aFntAccess( m_aSub[m_nActual].m_pMagic, m_aSub[m_nActual].m_nFontIndex,
&m_aSub[m_nActual], pSh );
- m_aSub[m_nActual].nOrgHeight = aFntAccess.Get()->GetFontHeight( pSh, rOut );
- m_aSub[m_nActual].nOrgAscent = aFntAccess.Get()->GetFontAscent( pSh, rOut );
+ m_aSub[m_nActual].m_nOrgHeight = aFntAccess.Get()->GetFontHeight( pSh, rOut );
+ m_aSub[m_nActual].m_nOrgAscent = aFntAccess.Get()->GetFontAscent( pSh, rOut );
SetProportion( nOldProp );
m_bOrgChg = false;
}
@@ -1024,13 +1024,13 @@ sal_uInt16 SwSubFont::CalcEscHeight( const sal_uInt16 nOldHeight,
DFLT_ESC_AUTO_SUB != GetEscapement() )
{
long nDescent = nOldHeight - nOldAscent -
- ( (long) nOrgHeight * GetEscapement() ) / 100L;
+ ( (long) m_nOrgHeight * GetEscapement() ) / 100L;
const sal_uInt16 nDesc = nDescent>0
- ? std::max<sal_uInt16>( nDescent, nOrgHeight - nOrgAscent)
- : nOrgHeight - nOrgAscent;
+ ? std::max<sal_uInt16>( nDescent, m_nOrgHeight - m_nOrgAscent)
+ : m_nOrgHeight - m_nOrgAscent;
return ( nDesc + CalcEscAscent( nOldAscent ) );
}
- return nOrgHeight;
+ return m_nOrgHeight;
}
short SwSubFont::_CheckKerning( )
@@ -1044,7 +1044,7 @@ short SwSubFont::_CheckKerning( )
sal_uInt16 SwSubFont::GetAscent( SwViewShell *pSh, const OutputDevice& rOut )
{
- SwFntAccess aFntAccess( pMagic, nFntIndex, this, pSh );
+ SwFntAccess aFntAccess( m_pMagic, m_nFontIndex, this, pSh );
const sal_uInt16 nAscent = aFntAccess.Get()->GetFontAscent( pSh, rOut );
return GetEscapement() ? CalcEscAscent( nAscent ) : nAscent;
}
@@ -1052,7 +1052,7 @@ sal_uInt16 SwSubFont::GetAscent( SwViewShell *pSh, const OutputDevice& rOut )
sal_uInt16 SwSubFont::GetHeight( SwViewShell *pSh, const OutputDevice& rOut )
{
SV_STAT( nGetTextSize );
- SwFntAccess aFntAccess( pMagic, nFntIndex, this, pSh );
+ SwFntAccess aFntAccess( m_pMagic, m_nFontIndex, this, pSh );
const sal_uInt16 nHeight = aFntAccess.Get()->GetFontHeight( pSh, rOut );
if ( GetEscapement() )
{
@@ -1066,7 +1066,7 @@ Size SwSubFont::_GetTextSize( SwDrawTextInfo& rInf )
{
// Robust: Eigentlich sollte der Font bereits eingestellt sein, aber
// sicher ist sicher ...
- if ( !pLastFont || pLastFont->GetOwner()!=pMagic ||
+ if ( !pLastFont || pLastFont->GetOwner()!=m_pMagic ||
!IsSameInstance( rInf.GetpOut()->GetFont() ) )
ChgFnt( rInf.GetShell(), rInf.GetOut() );
@@ -1179,7 +1179,7 @@ void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const bool bGrey )
pUnderFnt = rInf.GetUnderFnt();
}
- if( !pLastFont || pLastFont->GetOwner()!=pMagic )
+ if( !pLastFont || pLastFont->GetOwner()!=m_pMagic )
ChgFnt( rInf.GetShell(), rInf.GetOut() );
SwDigitModeModifier aDigitModeModifier( rInf.GetOut(), rInf.GetFont()->GetLanguage() );
@@ -1306,7 +1306,7 @@ void SwSubFont::_DrawStretchText( SwDrawTextInfo &rInf )
pUnderFnt = rInf.GetUnderFnt();
}
- if ( !pLastFont || pLastFont->GetOwner() != pMagic )
+ if ( !pLastFont || pLastFont->GetOwner() != m_pMagic )
ChgFnt( rInf.GetShell(), rInf.GetOut() );
SwDigitModeModifier aDigitModeModifier( rInf.GetOut(), rInf.GetFont()->GetLanguage() );
@@ -1375,7 +1375,7 @@ void SwSubFont::_DrawStretchText( SwDrawTextInfo &rInf )
sal_Int32 SwSubFont::_GetCrsrOfst( SwDrawTextInfo& rInf )
{
- if ( !pLastFont || pLastFont->GetOwner()!=pMagic )
+ if ( !pLastFont || pLastFont->GetOwner()!=m_pMagic )
ChgFnt( rInf.GetShell(), rInf.GetOut() );
SwDigitModeModifier aDigitModeModifier( rInf.GetOut(), rInf.GetFont()->GetLanguage() );
@@ -1416,7 +1416,7 @@ void SwSubFont::CalcEsc( SwDrawTextInfo& rInf, Point& rPos )
switch ( GetEscapement() )
{
case DFLT_ESC_AUTO_SUB :
- nOfst = nOrgHeight - nOrgAscent -
+ nOfst = m_nOrgHeight - m_nOrgAscent -
pLastFont->GetFontHeight( rInf.GetShell(), rInf.GetOut() ) +
pLastFont->GetFontAscent( rInf.GetShell(), rInf.GetOut() );
@@ -1436,7 +1436,7 @@ void SwSubFont::CalcEsc( SwDrawTextInfo& rInf, Point& rPos )
break;
case DFLT_ESC_AUTO_SUPER :
nOfst = pLastFont->GetFontAscent( rInf.GetShell(), rInf.GetOut() ) -
- nOrgAscent;
+ m_nOrgAscent;
switch ( nDir )
{
@@ -1453,7 +1453,7 @@ void SwSubFont::CalcEsc( SwDrawTextInfo& rInf, Point& rPos )
break;
default :
- nOfst = ((long)nOrgHeight * GetEscapement()) / 100L;
+ nOfst = ((long)m_nOrgHeight * GetEscapement()) / 100L;
switch ( nDir )
{
commit 495f4ca3119ed0a70338d454b2c8659501545d69
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed Oct 28 09:04:45 2015 +0100
sw: prefix members of SwTOXMark
Change-Id: Id8cc41ab9af5d6fe9934f97927c7e3d1e7f6ebf3
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 01a6d13..999c229 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -56,23 +56,23 @@ class SW_DLLPUBLIC SwTOXMark
friend void _InitCore();
friend class SwTextTOXMark;
- OUString aAltText; // Text of caption is different.
- OUString aPrimaryKey;
- OUString aSecondaryKey;
- OUString aCitationKeyReading;
+ OUString m_aAltText; // Text of caption is different.
+ OUString m_aPrimaryKey;
+ OUString m_aSecondaryKey;
+ OUString m_aCitationKeyReading;
// three more strings for phonetic sorting
- OUString aTextReading;
- OUString aPrimaryKeyReading;
- OUString aSecondaryKeyReading;
+ OUString m_aTextReading;
+ OUString m_aPrimaryKeyReading;
+ OUString m_aSecondaryKeyReading;
- SwTextTOXMark* pTextAttr;
+ SwTextTOXMark* m_pTextAttr;
- sal_uInt16 nLevel;
+ sal_uInt16 m_nLevel;
OUString m_aBookmarkName;
OUString m_aEntryTypeName; // stored specific entry type name for INDEX field \f
- bool bAutoGenerated : 1; // generated using a concordance file
- bool bMainEntry : 1; // main entry emphasized by character style
+ bool m_bAutoGenerated : 1; // generated using a concordance file
+ bool m_bMainEntry : 1; // main entry emphasized by character style
::com::sun::star::uno::WeakReference<
::com::sun::star::text::XDocumentIndexMark> m_wXDocumentIndexMark;
@@ -128,16 +128,16 @@ public:
inline OUString GetPrimaryKeyReading() const;
inline OUString GetSecondaryKeyReading() const;
- bool IsAutoGenerated() const {return bAutoGenerated;}
- void SetAutoGenerated(bool bSet) {bAutoGenerated = bSet;}
+ bool IsAutoGenerated() const {return m_bAutoGenerated;}
+ void SetAutoGenerated(bool bSet) {m_bAutoGenerated = bSet;}
- bool IsMainEntry() const {return bMainEntry;}
- void SetMainEntry(bool bSet) { bMainEntry = bSet;}
+ bool IsMainEntry() const {return m_bMainEntry;}
+ void SetMainEntry(bool bSet) { m_bMainEntry = bSet;}
inline const SwTOXType* GetTOXType() const;
- const SwTextTOXMark* GetTextTOXMark() const { return pTextAttr; }
- SwTextTOXMark* GetTextTOXMark() { return pTextAttr; }
+ const SwTextTOXMark* GetTextTOXMark() const { return m_pTextAttr; }
+ SwTextTOXMark* GetTextTOXMark() { return m_pTextAttr; }
SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference<
::com::sun::star::text::XDocumentIndexMark> const& GetXTOXMark() const
@@ -535,7 +535,7 @@ public:
//SwTOXMark
inline OUString SwTOXMark::GetAlternativeText() const
- { return aAltText; }
+ { return m_aAltText; }
inline OUString SwTOXMark::GetBookmarkName() const
{ return m_aBookmarkName; }
@@ -547,11 +547,11 @@ inline const SwTOXType* SwTOXMark::GetTOXType() const
{ return static_cast<const SwTOXType*>(GetRegisteredIn()); }
inline bool SwTOXMark::IsAlternativeText() const
- { return !aAltText.isEmpty(); }
+ { return !m_aAltText.isEmpty(); }
inline void SwTOXMark::SetAlternativeText(const OUString& rAlt)
{
- aAltText = rAlt;
+ m_aAltText = rAlt;
}
inline void SwTOXMark::SetBookmarkName(const OUString& bName)
@@ -566,79 +566,79 @@ inline void SwTOXMark::SetEntryTypeName(const OUString& sName)
inline void SwTOXMark::SetLevel( sal_uInt16 nLvl )
{
SAL_WARN_IF( GetTOXType() && GetTOXType()->GetType() == TOX_INDEX, "sw", "Wrong type");
- nLevel = nLvl;
+ m_nLevel = nLvl;
}
inline void SwTOXMark::SetPrimaryKey( const OUString& rKey )
{
SAL_WARN_IF( GetTOXType()->GetType() != TOX_INDEX, "sw", "Wrong type");
- aPrimaryKey = rKey;
+ m_aPrimaryKey = rKey;
}
inline void SwTOXMark::SetSecondaryKey( const OUString& rKey )
{
SAL_WARN_IF(GetTOXType()->GetType() != TOX_INDEX, "sw", "Wrong type");
- aSecondaryKey = rKey;
+ m_aSecondaryKey = rKey;
}
inline void SwTOXMark::SetTextReading( const OUString& rText )
{
SAL_WARN_IF(GetTOXType()->GetType() != TOX_INDEX, "sw", "Wrong type");
- aTextReading = rText;
+ m_aTextReading = rText;
}
inline void SwTOXMark::SetPrimaryKeyReading( const OUString& rKey )
{
SAL_WARN_IF(GetTOXType()->GetType() != TOX_INDEX, "sw", "Wrong type");
- aPrimaryKeyReading = rKey;
+ m_aPrimaryKeyReading = rKey;
}
inline void SwTOXMark::SetCitationKeyReading( const OUString& rKey )
{
SAL_WARN_IF(GetTOXType()->GetType() != TOX_CITATION, "sw", "Wrong type");
- aCitationKeyReading = rKey;
+ m_aCitationKeyReading = rKey;
}
inline void SwTOXMark::SetSecondaryKeyReading( const OUString& rKey )
{
SAL_WARN_IF(GetTOXType()->GetType() != TOX_INDEX, "sw", "Wrong type");
- aSecondaryKeyReading = rKey;
+ m_aSecondaryKeyReading = rKey;
}
inline sal_uInt16 SwTOXMark::GetLevel() const
{
SAL_WARN_IF( GetTOXType() && GetTOXType()->GetType() == TOX_INDEX, "sw", "Wrong type");
- return nLevel;
+ return m_nLevel;
}
inline OUString SwTOXMark::GetPrimaryKey() const
{
SAL_WARN_IF(GetTOXType()->GetType() != TOX_INDEX, "sw", "Wrong type");
- return aPrimaryKey;
+ return m_aPrimaryKey;
}
inline OUString SwTOXMark::GetSecondaryKey() const
{
SAL_WARN_IF(GetTOXType()->GetType() != TOX_INDEX, "sw", "Wrong type");
- return aSecondaryKey;
+ return m_aSecondaryKey;
}
inline OUString SwTOXMark::GetTextReading() const
{
SAL_WARN_IF(GetTOXType()->GetType() != TOX_INDEX, "sw", "Wrong type");
- return aTextReading;
+ return m_aTextReading;
}
inline OUString SwTOXMark::GetPrimaryKeyReading() const
{
SAL_WARN_IF(GetTOXType()->GetType() != TOX_INDEX, "sw", "Wrong type");
- return aPrimaryKeyReading;
+ return m_aPrimaryKeyReading;
}
inline OUString SwTOXMark::GetSecondaryKeyReading() const
{
SAL_WARN_IF(GetTOXType()->GetType() != TOX_INDEX, "sw", "Wrong type");
- return aSecondaryKeyReading;
+ return m_aSecondaryKeyReading;
}
//SwForm
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 26d7eb2..19d5f1d 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -98,9 +98,9 @@ SwTOXMark::SwTOXMark()
: SfxPoolItem( RES_TXTATR_TOXMARK )
, SwModify( 0 )
,
- pTextAttr( 0 ), nLevel( 0 ),
- bAutoGenerated(false),
- bMainEntry(false)
+ m_pTextAttr( 0 ), m_nLevel( 0 ),
+ m_bAutoGenerated(false),
+ m_bMainEntry(false)
{
}
@@ -108,9 +108,9 @@ SwTOXMark::SwTOXMark( const SwTOXType* pTyp )
: SfxPoolItem( RES_TXTATR_TOXMARK )
, SwModify( const_cast<SwTOXType*>(pTyp) )
,
- pTextAttr( 0 ), nLevel( 0 ),
- bAutoGenerated(false),
- bMainEntry(false)
+ m_pTextAttr( 0 ), m_nLevel( 0 ),
+ m_bAutoGenerated(false),
+ m_bMainEntry(false)
{
}
@@ -118,16 +118,16 @@ SwTOXMark::SwTOXMark( const SwTOXMark& rCopy )
: SfxPoolItem( RES_TXTATR_TOXMARK )
, SwModify(rCopy.GetRegisteredInNonConst())
,
- aPrimaryKey( rCopy.aPrimaryKey ), aSecondaryKey( rCopy.aSecondaryKey ),
- aTextReading( rCopy.aTextReading ),
- aPrimaryKeyReading( rCopy.aPrimaryKeyReading ),
- aSecondaryKeyReading( rCopy.aSecondaryKeyReading ),
- pTextAttr( 0 ), nLevel( rCopy.nLevel ),
- bAutoGenerated( rCopy.bAutoGenerated),
- bMainEntry(rCopy.bMainEntry)
+ m_aPrimaryKey( rCopy.m_aPrimaryKey ), m_aSecondaryKey( rCopy.m_aSecondaryKey ),
+ m_aTextReading( rCopy.m_aTextReading ),
+ m_aPrimaryKeyReading( rCopy.m_aPrimaryKeyReading ),
+ m_aSecondaryKeyReading( rCopy.m_aSecondaryKeyReading ),
+ m_pTextAttr( 0 ), m_nLevel( rCopy.m_nLevel ),
+ m_bAutoGenerated( rCopy.m_bAutoGenerated),
+ m_bMainEntry(rCopy.m_bMainEntry)
{
// Copy AlternativString
- aAltText = rCopy.aAltText;
+ m_aAltText = rCopy.m_aAltText;
}
SwTOXMark::~SwTOXMark()
@@ -169,17 +169,17 @@ void SwTOXMark::InvalidateTOXMark()
OUString SwTOXMark::GetText() const
{
- if( !aAltText.isEmpty() )
- return aAltText;
+ if( !m_aAltText.isEmpty() )
+ return m_aAltText;
- if( pTextAttr && pTextAttr->GetpTextNd() )
+ if( m_pTextAttr && m_pTextAttr->GetpTextNd() )
{
- const sal_Int32* pEndIdx = pTextAttr->GetEnd();
+ const sal_Int32* pEndIdx = m_pTextAttr->GetEnd();
OSL_ENSURE( pEndIdx, "TOXMark without mark!");
if( pEndIdx )
{
- const sal_Int32 nStt = pTextAttr->GetStart();
- return pTextAttr->GetpTextNd()->GetExpandText( nStt, *pEndIdx-nStt );
+ const sal_Int32 nStt = m_pTextAttr->GetStart();
+ return m_pTextAttr->GetpTextNd()->GetExpandText( nStt, *pEndIdx-nStt );
}
}
diff --git a/sw/source/core/txtnode/atrtox.cxx b/sw/source/core/txtnode/atrtox.cxx
index 99e7382..f395e6d 100644
--- a/sw/source/core/txtnode/atrtox.cxx
+++ b/sw/source/core/txtnode/atrtox.cxx
@@ -30,7 +30,7 @@ SwTextTOXMark::SwTextTOXMark( SwTOXMark& rAttr,
, m_pTextNode( 0 )
, m_pEnd( 0 )
{
- rAttr.pTextAttr = this;
+ rAttr.m_pTextAttr = this;
if ( rAttr.GetAlternativeText().isEmpty() )
{
m_nEnd = *pEnd;
commit 5645fb51e112f7532b0f5e3472937c54e6704c40
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed Oct 28 09:02:49 2015 +0100
sw: prefix members of SwTOXType
Change-Id: I8500dda538a82a920dd6164251bf193489b12a15
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index ccd41a7..01a6d13 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -163,8 +163,8 @@ public:
inline TOXTypes GetType() const;
private:
- OUString aName;
- TOXTypes eType;
+ OUString m_aName;
+ TOXTypes m_eType;
// @@@ public copy ctor, but no copy assignment?
SwTOXType & operator= (const SwTOXType &) = delete;
@@ -668,10 +668,10 @@ inline sal_uInt16 SwForm::GetFormMax() const
//SwTOXType
inline OUString SwTOXType::GetTypeName() const
- { return aName; }
+ { return m_aName; }
inline TOXTypes SwTOXType::GetType() const
- { return eType; }
+ { return m_eType; }
// SwTOXBase
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index ed8bd3c..26d7eb2 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -201,15 +201,15 @@ void SwTOXMark::InsertTOXMarks( SwTOXMarks& aMarks, const SwTOXType& rType )
// Manage types of TOX
SwTOXType::SwTOXType( TOXTypes eTyp, const OUString& rName )
: SwModify(0),
- aName(rName),
- eType(eTyp)
+ m_aName(rName),
+ m_eType(eTyp)
{
}
SwTOXType::SwTOXType(const SwTOXType& rCopy)
: SwModify( const_cast<SwModify*>(rCopy.GetRegisteredIn()) ),
- aName(rCopy.aName),
- eType(rCopy.eType)
+ m_aName(rCopy.m_aName),
+ m_eType(rCopy.m_eType)
{
}
commit 8c85e746dc52bf8ada89d4be6d193a0760af1b21
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed Oct 28 09:01:09 2015 +0100
sw: prefix members of SwTableBox
Change-Id: If4c4a043f3d9c2e1e89eb4199d33cd39f502c56e
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index c53f846..a30a466 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -391,9 +391,9 @@ class SW_DLLPUBLIC SwTableBox: public SwClient //Client of FrameFormat.
SwTableBox( const SwTableBox & ) = delete;
SwTableBox &operator=( const SwTableBox &) = delete;
- SwTableLines aLines;
- const SwStartNode * pSttNd;
- SwTableLine *pUpper;
+ SwTableLines m_aLines;
+ const SwStartNode * m_pStartNode;
+ SwTableLine *m_pUpper;
std::unique_ptr<Color> mpUserColor;
std::unique_ptr<Color> mpNumFormatColor;
@@ -417,12 +417,12 @@ public:
SwTableBox( SwTableBoxFormat*, const SwNodeIndex&, SwTableLine *pUp = 0 );
virtual ~SwTableBox();
- SwTableLines &GetTabLines() { return aLines; }
- const SwTableLines &GetTabLines() const { return aLines; }
+ SwTableLines &GetTabLines() { return m_aLines; }
+ const SwTableLines &GetTabLines() const { return m_aLines; }
- SwTableLine *GetUpper() { return pUpper; }
- const SwTableLine *GetUpper() const { return pUpper; }
- void SetUpper( SwTableLine *pNew ) { pUpper = pNew; }
+ SwTableLine *GetUpper() { return m_pUpper; }
+ const SwTableLine *GetUpper() const { return m_pUpper; }
+ void SetUpper( SwTableLine *pNew ) { m_pUpper = pNew; }
SwFrameFormat* GetFrameFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
@@ -438,7 +438,7 @@ public:
void ChgFrameFormat( SwTableBoxFormat *pNewFormat );
void RemoveFromTable();
- const SwStartNode *GetSttNd() const { return pSttNd; }
+ const SwStartNode *GetSttNd() const { return m_pStartNode; }
sal_uLong GetSttIdx() const;
// Search next/previous box with content.
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index b369311..1eda37b 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -81,7 +81,7 @@ double SwTableBox::GetValue( SwTableCalcPara& rCalcPara ) const
rCalcPara.rCalc.SetCalcError( CALC_SYNTAX ); // default: error
// no content box?
- if( !pSttNd )
+ if( !m_pStartNode )
return nRet;
if( rCalcPara.IncStackCnt() )
@@ -138,7 +138,7 @@ double SwTableBox::GetValue( SwTableCalcPara& rCalcPara ) const
break;
}
- SwTextNode* pTextNd = pDoc->GetNodes()[ pSttNd->GetIndex() + 1 ]->GetTextNode();
+ SwTextNode* pTextNd = pDoc->GetNodes()[ m_pStartNode->GetIndex() + 1 ]->GetTextNode();
if( !pTextNd )
break;
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 83a31fd..24d352e 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -240,7 +240,7 @@ void DelBoxNode( SwTableSortBoxes& rSortCntBoxes )
{
for (size_t n = 0; n < rSortCntBoxes.size(); ++n)
{
- rSortCntBoxes[ n ]->pSttNd = 0;
+ rSortCntBoxes[ n ]->m_pStartNode = 0;
}
}
@@ -1612,8 +1612,8 @@ SwTwips SwTableLine::GetTableLineHeight( bool& bLayoutAvailable ) const
}
SwTableBox::SwTableBox()
- : pSttNd(0)
- , pUpper(0)
+ : m_pStartNode(0)
+ , m_pUpper(0)
, mnRowSpan(1)
, mbDummyFlag(false)
, mbDirectFormatting(false)
@@ -1622,32 +1622,32 @@ SwTableBox::SwTableBox()
SwTableBox::SwTableBox( SwTableBoxFormat* pFormat, sal_uInt16 nLines, SwTableLine *pUp )
: SwClient(0)
- , aLines()
- , pSttNd(0)
- , pUpper(pUp)
+ , m_aLines()
+ , m_pStartNode(0)
+ , m_pUpper(pUp)
, mnRowSpan(1)
, mbDummyFlag(false)
, mbDirectFormatting(false)
{
- aLines.reserve( nLines );
+ m_aLines.reserve( nLines );
CheckBoxFormat( pFormat )->Add( this );
}
SwTableBox::SwTableBox( SwTableBoxFormat* pFormat, const SwNodeIndex &rIdx,
SwTableLine *pUp )
: SwClient(0)
- , aLines()
- , pUpper(pUp)
+ , m_aLines()
+ , m_pUpper(pUp)
, mnRowSpan(1)
, mbDummyFlag(false)
, mbDirectFormatting(false)
{
CheckBoxFormat( pFormat )->Add( this );
- pSttNd = rIdx.GetNode().GetStartNode();
+ m_pStartNode = rIdx.GetNode().GetStartNode();
// insert into the table
- const SwTableNode* pTableNd = pSttNd->FindTableNode();
+ const SwTableNode* pTableNd = m_pStartNode->FindTableNode();
OSL_ENSURE( pTableNd, "In which table is that box?" );
SwTableSortBoxes& rSrtArr = (SwTableSortBoxes&)pTableNd->GetTable().
GetTabSortBoxes();
@@ -1657,9 +1657,9 @@ SwTableBox::SwTableBox( SwTableBoxFormat* pFormat, const SwNodeIndex &rIdx,
SwTableBox::SwTableBox( SwTableBoxFormat* pFormat, const SwStartNode& rSttNd, SwTableLine *pUp )
: SwClient(0)
- , aLines()
- , pSttNd(&rSttNd)
- , pUpper(pUp)
+ , m_aLines()
+ , m_pStartNode(&rSttNd)
+ , m_pUpper(pUp)
, mnRowSpan(1)
, mbDummyFlag(false)
, mbDirectFormatting(false)
@@ -1667,7 +1667,7 @@ SwTableBox::SwTableBox( SwTableBoxFormat* pFormat, const SwStartNode& rSttNd, Sw
CheckBoxFormat( pFormat )->Add( this );
// insert into the table
- const SwTableNode* pTableNd = pSttNd->FindTableNode();
+ const SwTableNode* pTableNd = m_pStartNode->FindTableNode();
OSL_ENSURE( pTableNd, "In which table is the box?" );
SwTableSortBoxes& rSrtArr = (SwTableSortBoxes&)pTableNd->GetTable().
GetTabSortBoxes();
@@ -1677,16 +1677,16 @@ SwTableBox::SwTableBox( SwTableBoxFormat* pFormat, const SwStartNode& rSttNd, Sw
void SwTableBox::RemoveFromTable()
{
- if (pSttNd) // box containing contents?
+ if (m_pStartNode) // box containing contents?
{
// remove from table
- const SwTableNode* pTableNd = pSttNd->FindTableNode();
+ const SwTableNode* pTableNd = m_pStartNode->FindTableNode();
assert(pTableNd && "In which table is that box?");
SwTableSortBoxes& rSrtArr = (SwTableSortBoxes&)pTableNd->GetTable().
GetTabSortBoxes();
SwTableBox *p = this; // error: &this
rSrtArr.erase( p ); // remove
- pSttNd = 0; // clear it so this is only run once
+ m_pStartNode = 0; // clear it so this is only run once
}
}
@@ -1824,13 +1824,13 @@ void sw_GetTableBoxColStr( sal_uInt16 nCol, OUString& rNm )
Point SwTableBox::GetCoordinates() const
{
- if( !pSttNd ) // box without content?
+ if( !m_pStartNode ) // box without content?
{
// search for the next first box?
return Point( 0, 0 );
}
- const SwTable& rTable = pSttNd->FindTableNode()->GetTable();
+ const SwTable& rTable = m_pStartNode->FindTableNode()->GetTable();
sal_uInt16 nX, nY;
const SwTableBox* pBox = this;
do {
@@ -1849,13 +1849,13 @@ Point SwTableBox::GetCoordinates() const
OUString SwTableBox::GetName() const
{
- if( !pSttNd ) // box without content?
+ if( !m_pStartNode ) // box without content?
{
// search for the next first box?
return OUString();
}
- const SwTable& rTable = pSttNd->FindTableNode()->GetTable();
+ const SwTable& rTable = m_pStartNode->FindTableNode()->GetTable();
sal_uInt16 nPos;
OUString sNm, sTmp;
const SwTableBox* pBox = this;
@@ -1888,7 +1888,7 @@ bool SwTableBox::IsInHeadline( const SwTable* pTable ) const
return false;
if( !pTable )
- pTable = &pSttNd->FindTableNode()->GetTable();
+ pTable = &m_pStartNode->FindTableNode()->GetTable();
const SwTableLine* pLine = GetUpper();
while( pLine->GetUpper() )
@@ -1900,7 +1900,7 @@ bool SwTableBox::IsInHeadline( const SwTable* pTable ) const
sal_uLong SwTableBox::GetSttIdx() const
{
- return pSttNd ? pSttNd->GetIndex() : 0;
+ return m_pStartNode ? m_pStartNode->GetIndex() : 0;
}
// retrieve information from the client
@@ -2381,7 +2381,7 @@ bool SwTableBox::HasNumContent( double& rNum, sal_uInt32& rFormatIndex,
sal_uLong nNdPos = IsValidNumTextNd();
if( ULONG_MAX != nNdPos )
{
- OUString aText( pSttNd->GetNodes()[ nNdPos ]->GetTextNode()->GetRedlineText() );
+ OUString aText( m_pStartNode->GetNodes()[ nNdPos ]->GetTextNode()->GetRedlineText() );
// Keep Tabs
lcl_TabToBlankAtSttEnd( aText );
rIsEmptyTextNd = aText.isEmpty();
@@ -2429,7 +2429,7 @@ bool SwTableBox::IsNumberChanged() const
sal_uLong nNdPos;
if( pNumFormat && pValue && ULONG_MAX != ( nNdPos = IsValidNumTextNd() ) )
{
- OUString sNewText, sOldText( pSttNd->GetNodes()[ nNdPos ]->
+ OUString sNewText, sOldText( m_pStartNode->GetNodes()[ nNdPos ]->
GetTextNode()->GetRedlineText() );
lcl_DelTabsAtSttEnd( sOldText );
@@ -2449,15 +2449,15 @@ bool SwTableBox::IsNumberChanged() const
sal_uLong SwTableBox::IsValidNumTextNd( bool bCheckAttr ) const
{
sal_uLong nPos = ULONG_MAX;
- if( pSttNd )
+ if( m_pStartNode )
{
- SwNodeIndex aIdx( *pSttNd );
+ SwNodeIndex aIdx( *m_pStartNode );
sal_uLong nIndex = aIdx.GetIndex();
- const sal_uLong nIndexEnd = pSttNd->GetNodes()[ nIndex ]->EndOfSectionIndex();
+ const sal_uLong nIndexEnd = m_pStartNode->GetNodes()[ nIndex ]->EndOfSectionIndex();
const SwTextNode *pTextNode = 0;
while( ++nIndex < nIndexEnd )
{
- const SwNode* pNode = pSttNd->GetNodes()[nIndex];
+ const SwNode* pNode = m_pStartNode->GetNodes()[nIndex];
if( pNode->IsTableNode() )
{
pTextNode = 0;
@@ -2535,8 +2535,8 @@ sal_uInt16 SwTableBox::IsFormulaOrValueBox() const
!pFormat->GetDoc()->GetNumberFormatter()->IsTextFormat(
pFormat->GetTableBoxNumFormat().GetValue() ))
nWhich = RES_BOXATR_VALUE;
- else if( pSttNd && pSttNd->GetIndex() + 2 == pSttNd->EndOfSectionIndex()
- && 0 != ( pTNd = pSttNd->GetNodes()[ pSttNd->GetIndex() + 1 ]
+ else if( m_pStartNode && m_pStartNode->GetIndex() + 2 == m_pStartNode->EndOfSectionIndex()
+ && 0 != ( pTNd = m_pStartNode->GetNodes()[ m_pStartNode->GetIndex() + 1 ]
->GetTextNode() ) && pTNd->GetText().isEmpty())
nWhich = USHRT_MAX;
@@ -2562,7 +2562,7 @@ void SwTableBox::ActualiseValueBox()
OUString sNewText;
pNumFormatr->GetOutputString( fVal, nFormatId, sNewText, &pCol );
- const OUString& rText = pSttNd->GetNodes()[ nNdPos ]->GetTextNode()->GetText();
+ const OUString& rText = m_pStartNode->GetNodes()[ nNdPos ]->GetTextNode()->GetText();
if( rText != sNewText )
ChgTextToNum( *this, sNewText, pCol, false ,nNdPos);
}
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 46bcedf..8e27342 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -2765,7 +2765,7 @@ void SwXMLTableContext::MakeTable()
SwTableLine *pLine1 = pTableNode->GetTable().GetTabLines()[0U];
OSL_ENSURE( pBox1 == pLine1->GetTabBoxes()[0U],
"Why is box 1 change?" );
- pBox1->pSttNd = pSttNd1;
+ pBox1->m_pStartNode = pSttNd1;
pLine1->GetTabBoxes().erase( pLine1->GetTabBoxes().begin() );
pLineFormat = static_cast<SwTableLineFormat*>(pLine1->GetFrameFormat());
@@ -2879,7 +2879,7 @@ const SwStartNode *SwXMLTableContext::InsertTableSection(
if( !pPrevSttNd && pBox1 != NULL )
{
- pBox1->pSttNd = pStNd;
+ pBox1->m_pStartNode = pStNd;
SwContentNode *pCNd = pDoc->GetNodes()[ pStNd->GetIndex() + 1 ]
->GetContentNode();
SwPosition aPos( *pCNd );
More information about the Libreoffice-commits
mailing list