diff options
Diffstat (limited to 'sw/source/core/edit/edtox.cxx')
-rw-r--r-- | sw/source/core/edit/edtox.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx index 879285db36ff..7babb2d3a588 100644 --- a/sw/source/core/edit/edtox.cxx +++ b/sw/source/core/edit/edtox.cxx @@ -111,7 +111,7 @@ void SwEditShell::SetTOXBaseReadonly(const SwTOXBase& rTOXBase, bool bReadonly) SwSectionData aSectionData(rTOXSect); aSectionData.SetProtectFlag(bReadonly); - UpdateSection( GetSectionFmtPos( *rTOXSect.GetFmt() ), aSectionData, 0 ); + UpdateSection( GetSectionFormatPos( *rTOXSect.GetFormat() ), aSectionData, 0 ); } const SwTOXBase* SwEditShell::GetDefaultTOXBase( TOXTypes eTyp, bool bCreate ) @@ -161,7 +161,7 @@ bool SwEditShell::UpdateTableOf( const SwTOXBase& rTOX, const SfxItemSet* pSet ) OSL_ENSURE( rTOX.ISA( SwTOXBaseSection ), "no TOXBaseSection!" ); SwTOXBaseSection* pTOX = const_cast<SwTOXBaseSection*>(static_cast<const SwTOXBaseSection*>(&rTOX)); OSL_ENSURE(pTOX, "no current listing"); - if( pTOX && 0 != pTOX->GetFmt()->GetSectionNode() ) + if( pTOX && 0 != pTOX->GetFormat()->GetSectionNode() ) { SwDoc* pMyDoc = GetDoc(); SwDocShell* pDocSh = pMyDoc->GetDocShell(); @@ -223,13 +223,13 @@ sal_uInt16 SwEditShell::GetTOIKeys( SwTOIKeyType eTyp, std::vector<OUString>& rA sal_uInt16 SwEditShell::GetTOXCount() const { - const SwSectionFmts& rFmts = GetDoc()->GetSections(); + const SwSectionFormats& rFormats = GetDoc()->GetSections(); sal_uInt16 nRet = 0; - for( auto n = rFmts.size(); n; ) + for( auto n = rFormats.size(); n; ) { - const SwSection* pSect = rFmts[ --n ]->GetSection(); + const SwSection* pSect = rFormats[ --n ]->GetSection(); if( TOX_CONTENT_SECTION == pSect->GetType() && - pSect->GetFmt()->GetSectionNode() ) + pSect->GetFormat()->GetSectionNode() ) ++nRet; } return nRet; @@ -237,13 +237,13 @@ sal_uInt16 SwEditShell::GetTOXCount() const const SwTOXBase* SwEditShell::GetTOX( sal_uInt16 nPos ) const { - const SwSectionFmts& rFmts = GetDoc()->GetSections(); + const SwSectionFormats& rFormats = GetDoc()->GetSections(); sal_uInt16 nCnt {0}; - for( const SwSectionFmt *pFmt : rFmts ) + for( const SwSectionFormat *pFormat : rFormats ) { - const SwSection* pSect = pFmt->GetSection(); + const SwSection* pSect = pFormat->GetSection(); if( TOX_CONTENT_SECTION == pSect->GetType() && - pSect->GetFmt()->GetSectionNode() && + pSect->GetFormat()->GetSectionNode() && nCnt++ == nPos ) { OSL_ENSURE( pSect->ISA( SwTOXBaseSection ), "no TOXBaseSection!" ); @@ -295,7 +295,7 @@ void SwEditShell::ApplyAutoMark() SwTOXMark::InsertTOXMarks( aMarks, *pTOXType ); for( SwTOXMark* pMark : aMarks ) { - if(pMark->IsAutoGenerated() && pMark->GetTxtTOXMark()) + if(pMark->IsAutoGenerated() && pMark->GetTextTOXMark()) // mba: test iteration; objects are deleted in iteration DeleteTOXMark(pMark); } |