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/text/porlay.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/text/porlay.cxx')
-rw-r--r-- | sw/source/core/text/porlay.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx index 7d483f5d5c72..e29d93f485a7 100644 --- a/sw/source/core/text/porlay.cxx +++ b/sw/source/core/text/porlay.cxx @@ -270,7 +270,7 @@ void SwLineLayout::CalcLine( SwTextFormatter &rLine, SwTextFormatInfo &rInf ) // #i3952# const bool bIgnoreBlanksAndTabsForLineHeightCalculation = - rInf.GetTextFrm()->GetNode()->getIDocumentSettingAccess()->get(DocumentSettingId::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION); + rInf.GetTextFrame()->GetNode()->getIDocumentSettingAccess()->get(DocumentSettingId::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION); bool bHasBlankPortion = false; bool bHasOnlyBlankPortions = true; @@ -299,7 +299,7 @@ void SwLineLayout::CalcLine( SwTextFormatter &rLine, SwTextFormatInfo &rInf ) SAL_WARN_IF( POR_LIN == pPos->GetWhichPor(), "sw.core", "SwLineLayout::CalcLine: don't use SwLinePortions !" ); - // Null portions are eliminated. They can form if two FlyFrms + // Null portions are eliminated. They can form if two FlyFrames // overlap. if( !pPos->Compress() ) { @@ -1937,10 +1937,10 @@ sal_Int32 SwScriptInfo::ThaiJustify( const OUString& rText, long* pKernArray, SwScriptInfo* SwScriptInfo::GetScriptInfo( const SwTextNode& rTNd, bool bAllowInvalid ) { - SwIterator<SwTextFrm,SwTextNode> aIter( rTNd ); + SwIterator<SwTextFrame,SwTextNode> aIter( rTNd ); SwScriptInfo* pScriptInfo = nullptr; - for( SwTextFrm* pLast = aIter.First(); pLast; pLast = aIter.Next() ) + for( SwTextFrame* pLast = aIter.First(); pLast; pLast = aIter.Next() ) { pScriptInfo = const_cast<SwScriptInfo*>(pLast->GetScriptInfo()); if ( pScriptInfo ) @@ -2031,7 +2031,7 @@ SwTwips SwLineLayout::_GetHangingMargin() const return nDiff; } -SwTwips SwTextFrm::HangingMargin() const +SwTwips SwTextFrame::HangingMargin() const { SAL_WARN_IF( !HasPara(), "sw.core", "Don't call me without a paraportion" ); if( !GetPara()->IsMargin() ) |