diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-05-20 13:05:49 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-05-20 13:05:49 +0200 |
| commit | ab465b90f6c6da5595393a0ba73f33a1e71a2b65 (patch) | |
| tree | 36b77192de2799a11b4bf0b269cb3f74d0a0bb1f /sw/source/core/doc/lineinfo.cxx | |
| parent | 0db96caf0fcce09b87621c11b584a6d81cc7df86 (diff) | |
bin/rename-sw-abbreviations.shlibreoffice-5-0-branch-point
renames the most annoying abbreviations in Writer (and partially
in the shared code too).
Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9
Diffstat (limited to 'sw/source/core/doc/lineinfo.cxx')
| -rw-r--r-- | sw/source/core/doc/lineinfo.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/core/doc/lineinfo.cxx b/sw/source/core/doc/lineinfo.cxx index e000b9181292..578b5767c8a6 100644 --- a/sw/source/core/doc/lineinfo.cxx +++ b/sw/source/core/doc/lineinfo.cxx @@ -39,8 +39,8 @@ void SwDoc::SetLineNumberInfo( const SwLineNumberInfo &rNew ) pTmpRoot->StartAllAction(); // FME 2007-08-14 #i80120# Invalidate size, because ChgThisLines() // is only (onny may only be) called by the formatting routines - //pTmpRoot->InvalidateAllCntnt( INV_LINENUM | INV_SIZE ); - std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllCntnt), INV_LINENUM | INV_SIZE)); + //pTmpRoot->InvalidateAllContent( INV_LINENUM | INV_SIZE ); + std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllContent), INV_LINENUM | INV_SIZE)); pTmpRoot->EndAllAction(); } *mpLineNumberInfo = rNew; @@ -116,26 +116,26 @@ bool SwLineNumberInfo::operator==( const SwLineNumberInfo& rInf ) const bRestartEachPage == rInf.IsRestartEachPage(); } -SwCharFmt* SwLineNumberInfo::GetCharFmt( IDocumentStylePoolAccess& rIDSPA ) const +SwCharFormat* SwLineNumberInfo::GetCharFormat( IDocumentStylePoolAccess& rIDSPA ) const { if ( !GetRegisteredIn() ) { - SwCharFmt* pFmt = rIDSPA.GetCharFmtFromPool( RES_POOLCHR_LINENUM ); - pFmt->Add( (SwClient*)this ); + SwCharFormat* pFormat = rIDSPA.GetCharFormatFromPool( RES_POOLCHR_LINENUM ); + pFormat->Add( (SwClient*)this ); } - return const_cast<SwCharFmt*>(static_cast<const SwCharFmt*>(GetRegisteredIn())); + return const_cast<SwCharFormat*>(static_cast<const SwCharFormat*>(GetRegisteredIn())); } -void SwLineNumberInfo::SetCharFmt( SwCharFmt *pChFmt ) +void SwLineNumberInfo::SetCharFormat( SwCharFormat *pChFormat ) { - OSL_ENSURE( pChFmt, "SetCharFmt, 0 is not a valid pointer" ); - pChFmt->Add( this ); + OSL_ENSURE( pChFormat, "SetCharFormat, 0 is not a valid pointer" ); + pChFormat->Add( this ); } void SwLineNumberInfo::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) { CheckRegistration( pOld, pNew ); - SwDoc *pDoc = static_cast<SwCharFmt*>(GetRegisteredIn())->GetDoc(); + SwDoc *pDoc = static_cast<SwCharFormat*>(GetRegisteredIn())->GetDoc(); SwRootFrm* pRoot = pDoc->getIDocumentLayoutAccess().GetCurrentLayout(); if( pRoot ) { |