diff options
Diffstat (limited to 'sw/source/core/attr')
| -rw-r--r-- | sw/source/core/attr/calbck.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/attr/format.cxx | 28 | ||||
| -rw-r--r-- | sw/source/core/attr/hints.cxx | 4 |
3 files changed, 18 insertions, 18 deletions
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx index e98cd5cac8ca..8c671de14cee 100644 --- a/sw/source/core/attr/calbck.cxx +++ b/sw/source/core/attr/calbck.cxx @@ -91,7 +91,7 @@ SwModify::~SwModify() OSL_ENSURE( !IsModifyLocked(), "Modify destroyed but locked." ); if ( IsInCache() ) - SwFrm::GetCache().Delete( this ); + SwFrame::GetCache().Delete( this ); if ( IsInSwFntCache() ) pSwFontCache->Delete( this ); @@ -258,7 +258,7 @@ void SwModify::CheckCaching( const sal_uInt16 nWhich ) case RES_BREAK: if( IsInCache() ) { - SwFrm::GetCache().Delete( this ); + SwFrame::GetCache().Delete( this ); SetInCache( false ); } break; diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx index 1c86b77d92e2..d350b3278519 100644 --- a/sw/source/core/attr/format.cxx +++ b/sw/source/core/attr/format.cxx @@ -40,9 +40,9 @@ using namespace com::sun::star; SwFormat::SwFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, - const sal_uInt16* pWhichRanges, SwFormat *pDrvdFrm, + const sal_uInt16* pWhichRanges, SwFormat *pDrvdFrame, sal_uInt16 nFormatWhich ) - : SwModify( pDrvdFrm ), + : SwModify( pDrvdFrame ), m_aFormatName( OUString::createFromAscii(pFormatNm) ), m_aSet( rPool, pWhichRanges ), m_nWhichId( nFormatWhich ), @@ -54,14 +54,14 @@ SwFormat::SwFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, m_bAutoFormat = true; m_bWritten = m_bFormatInDTOR = m_bHidden = false; - if( pDrvdFrm ) - m_aSet.SetParent( &pDrvdFrm->m_aSet ); + if( pDrvdFrame ) + m_aSet.SetParent( &pDrvdFrame->m_aSet ); } SwFormat::SwFormat( SwAttrPool& rPool, const OUString& rFormatNm, - const sal_uInt16* pWhichRanges, SwFormat* pDrvdFrm, + const sal_uInt16* pWhichRanges, SwFormat* pDrvdFrame, sal_uInt16 nFormatWhich ) - : SwModify( pDrvdFrm ), + : SwModify( pDrvdFrame ), m_aFormatName( rFormatNm ), m_aSet( rPool, pWhichRanges ), m_nWhichId( nFormatWhich ), @@ -73,8 +73,8 @@ SwFormat::SwFormat( SwAttrPool& rPool, const OUString& rFormatNm, m_bAutoFormat = true; m_bWritten = m_bFormatInDTOR = m_bHidden = false; - if( pDrvdFrm ) - m_aSet.SetParent( &pDrvdFrm->m_aSet ); + if( pDrvdFrame ) + m_aSet.SetParent( &pDrvdFrame->m_aSet ); } SwFormat::SwFormat( const SwFormat& rFormat ) @@ -106,7 +106,7 @@ SwFormat &SwFormat::operator=(const SwFormat& rFormat) if ( IsInCache() ) { - SwFrm::GetCache().Delete( this ); + SwFrame::GetCache().Delete( this ); SetInCache( false ); } SetInSwFntCache( false ); @@ -180,7 +180,7 @@ void SwFormat::CopyAttrs( const SwFormat& rFormat, bool bReplace ) // copy only array with attributes delta if ( IsInCache() ) { - SwFrm::GetCache().Delete( this ); + SwFrame::GetCache().Delete( this ); SetInCache( false ); } SetInSwFntCache( false ); @@ -376,7 +376,7 @@ bool SwFormat::SetDerivedFrom(SwFormat *pDerFrom) if ( IsInCache() ) { - SwFrm::GetCache().Delete( this ); + SwFrame::GetCache().Delete( this ); SetInCache( false ); } SetInSwFntCache( false ); @@ -571,7 +571,7 @@ bool SwFormat::SetFormatAttr( const SfxItemSet& rSet ) if ( IsInCache() ) { - SwFrm::GetCache().Delete( this ); + SwFrame::GetCache().Delete( this ); SetInCache( false ); } SetInSwFntCache( false ); @@ -707,7 +707,7 @@ sal_uInt16 SwFormat::ResetAllFormatAttr() if ( IsInCache() ) { - SwFrm::GetCache().Delete( this ); + SwFrame::GetCache().Delete( this ); SetInCache( false ); } SetInSwFntCache( false ); @@ -740,7 +740,7 @@ void SwFormat::DelDiffs( const SfxItemSet& rSet ) if ( IsInCache() ) { - SwFrm::GetCache().Delete( this ); + SwFrame::GetCache().Delete( this ); SetInCache( false ); } SetInSwFntCache( false ); diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx index 04176ba1e703..32f92d7bf444 100644 --- a/sw/source/core/attr/hints.cxx +++ b/sw/source/core/attr/hints.cxx @@ -144,8 +144,8 @@ SwCondCollCondChg::SwCondCollCondChg( SwFormat *pFormat ) { } -SwVirtPageNumInfo::SwVirtPageNumInfo( const SwPageFrm *pPg ) : - SwMsgPoolItem( RES_VIRTPAGENUM_INFO ), m_pPage( nullptr ), m_pOrigPage( pPg ), m_pFrm( nullptr ) +SwVirtPageNumInfo::SwVirtPageNumInfo( const SwPageFrame *pPg ) : + SwMsgPoolItem( RES_VIRTPAGENUM_INFO ), m_pPage( nullptr ), m_pOrigPage( pPg ), m_pFrame( nullptr ) { } |