diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2020-01-20 09:08:33 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2020-01-20 09:57:23 +0100 |
commit | 71088fb7c7b8e0af37919fc53223203d8a560842 (patch) | |
tree | 1b9d90c4ab2b3fc0e7972cd215c8d701fd3d00f0 /sw/source/core/txtnode | |
parent | a0464b6321c5824a9f76c7c8689bbedc846ef032 (diff) |
sw: prefix members of SwEndNoteInfo and SwFootnoteInfo
Change-Id: Ie952701e6cb65cb0d5789b4f98005872286a41ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87052
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'sw/source/core/txtnode')
-rw-r--r-- | sw/source/core/txtnode/atrftn.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/txtnode/ndtxt.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx index a3f0332cb654..ad5110d4082a 100644 --- a/sw/source/core/txtnode/atrftn.cxx +++ b/sw/source/core/txtnode/atrftn.cxx @@ -250,7 +250,7 @@ OUString SwFormatFootnote::GetViewNumStr(const SwDoc& rDoc, pInfo = &rDoc.GetEndNoteInfo(); else pInfo = &rDoc.GetFootnoteInfo(); - sRet = pInfo->aFormat.GetNumStr( nNumber ); + sRet = pInfo->m_aFormat.GetNumStr( nNumber ); if( bInclStrings ) { sRet = pInfo->GetPrefix() + sRet + pInfo->GetSuffix(); diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 9f3331c1ecb4..9b2095a27e55 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -1579,7 +1579,7 @@ void SwTextNode::ChgTextCollUpdateNum( const SwTextFormatColl *pOldColl, SwNodes& rNds = GetNodes(); // If Level 0 (Chapter), update the footnotes! if( ( !nNewLevel || !nOldLevel) && pDoc && !pDoc->GetFootnoteIdxs().empty() && - FTNNUM_CHAPTER == pDoc->GetFootnoteInfo().eNum && + FTNNUM_CHAPTER == pDoc->GetFootnoteInfo().m_eNum && rNds.IsDocNodes() ) { SwNodeIndex aTmpIndex( rNds, GetIndex()); @@ -3522,10 +3522,10 @@ bool SwTextNode::CopyExpandText(SwTextNode& rDestNd, const SwIndex* pDestIdx, if( !rFootnote.GetNumStr().isEmpty() ) sExpand = rFootnote.GetNumStr(); else if( rFootnote.IsEndNote() ) - sExpand = GetDoc()->GetEndNoteInfo().aFormat. + sExpand = GetDoc()->GetEndNoteInfo().m_aFormat. GetNumStr(number); else - sExpand = GetDoc()->GetFootnoteInfo().aFormat. + sExpand = GetDoc()->GetFootnoteInfo().m_aFormat. GetNumStr(number); if( !sExpand.isEmpty() ) { |