diff options
author | Robinson Tryon <qubit@runcibility.com> | 2015-11-25 06:03:10 -0500 |
---|---|---|
committer | Robinson Tryon <qubit@runcibility.com> | 2015-11-25 06:07:38 -0500 |
commit | 49c2b9808df8a6b197dec666dfc0cda6321a4306 (patch) | |
tree | 045ef4b9b8dfdb06bfbe18cdf773d59f57d5552d /sw/source/core/view/vnew.cxx | |
parent | 5470a365f25e5052b4dd74f76aa2196f0d70934b (diff) |
bin/rename-sw-abbreviations.sh
libreoffice-5-1-branch-point
This commit renames the most annoying abbreviations in Writer (and
partially in the shared code too).
Change-Id: I77e5134f42f25e3786afa36b7a505c7e3237a9e8
Diffstat (limited to 'sw/source/core/view/vnew.cxx')
-rw-r--r-- | sw/source/core/view/vnew.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx index 2b8300cdd742..b49ce2ca1575 100644 --- a/sw/source/core/view/vnew.cxx +++ b/sw/source/core/view/vnew.cxx @@ -125,9 +125,9 @@ void SwViewShell::Init( const SwViewOption *pNewOpt ) // end of "disable multiple layouts" if( !mpLayout ) { - // switched to two step construction because creating the layout in SwRootFrm needs a valid pLayout set - mpLayout = SwRootFrmPtr(new SwRootFrm(mpDoc->GetDfltFrameFormat(), this), - &SwFrm::DestroyFrm); + // switched to two step construction because creating the layout in SwRootFrame needs a valid pLayout set + mpLayout = SwRootFramePtr(new SwRootFrame(mpDoc->GetDfltFrameFormat(), this), + &SwFrame::DestroyFrame); mpLayout->Init( mpDoc->GetDfltFrameFormat() ); } } @@ -216,8 +216,8 @@ SwViewShell::SwViewShell( SwDoc& rDocument, vcl::Window *pWindow, } // extend format cache. - if ( SwTextFrm::GetTextCache()->GetCurMax() < 2550 ) - SwTextFrm::GetTextCache()->IncreaseMax( 100 ); + if ( SwTextFrame::GetTextCache()->GetCurMax() < 2550 ) + SwTextFrame::GetTextCache()->IncreaseMax( 100 ); if( mpOpt->IsGridVisible() || getIDocumentDrawModelAccess().GetDrawModel() ) Imp()->MakeDrawView(); @@ -291,8 +291,8 @@ SwViewShell::SwViewShell( SwViewShell& rShell, vcl::Window *pWindow, } // extend format cache. - if ( SwTextFrm::GetTextCache()->GetCurMax() < 2550 ) - SwTextFrm::GetTextCache()->IncreaseMax( 100 ); + if ( SwTextFrame::GetTextCache()->GetCurMax() < 2550 ) + SwTextFrame::GetTextCache()->IncreaseMax( 100 ); if( mpOpt->IsGridVisible() || getIDocumentDrawModelAccess().GetDrawModel() ) Imp()->MakeDrawView(); @@ -324,11 +324,11 @@ SwViewShell::~SwViewShell() { if( pGNd->IsAnimated() ) { - SwIterator<SwFrm,SwGrfNode> aIter( *pGNd ); - for( SwFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() ) + SwIterator<SwFrame,SwGrfNode> aIter( *pGNd ); + for( SwFrame* pFrame = aIter.First(); pFrame; pFrame = aIter.Next() ) { - OSL_ENSURE( pFrm->IsNoTextFrm(), "GraphicNode with Text?" ); - static_cast<SwNoTextFrm*>(pFrm)->StopAnimation( mpOut ); + OSL_ENSURE( pFrame->IsNoTextFrame(), "GraphicNode with Text?" ); + static_cast<SwNoTextFrame*>(pFrame)->StopAnimation( mpOut ); } } } @@ -339,7 +339,7 @@ SwViewShell::~SwViewShell() } delete mpImp; // Delete first, so that the LayoutViews are destroyed. - mpImp = nullptr; // Set to zero, because ~SwFrm relies on it. + mpImp = nullptr; // Set to zero, because ~SwFrame relies on it. if ( mpDoc ) { @@ -352,8 +352,8 @@ SwViewShell::~SwViewShell() delete mpOpt; // resize format cache. - if ( SwTextFrm::GetTextCache()->GetCurMax() > 250 ) - SwTextFrm::GetTextCache()->DecreaseMax( 100 ); + if ( SwTextFrame::GetTextCache()->GetCurMax() > 250 ) + SwTextFrame::GetTextCache()->DecreaseMax( 100 ); // Remove from PaintQueue if necessary SwPaintQueue::Remove( this ); |