mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#90834 Cleanup in-line version control history comments

Browse Source 
Turn in-line version control history comments into
meaningful good comments: frmform.cxx

Change-Id: Iadfeca748b7d1f0a8e5eadb684ebf66d8e026931
Reviewed-on: https://gerrit.libreoffice.org/23705
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
Tested-by: jan iversen <jani@documentfoundation.org>
This commit is contained in:
Muhammet Kara
2016-03-31 11:26:34 +03:00
committed by jan iversen
parent 20f98f5239
commit 403793990c
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
sw/source/core/text/frmform.cxx
View File

@@ -250,10 +250,10 @@ bool SwTextFrame::CalcFollow( const sal_Int32 nTextOfst )
( ! pSct->IsVertical() && !pSct->Frame().Height() ) ) ( ! pSct->IsVertical() && !pSct->Frame().Height() ) )
break; break;
} }
// OD 14.03.2003 #i11760# - intrinsic format of follow is controlled. // i#11760 - Intrinsic format of follow is controlled.
if ( FollowFormatAllowed() ) if ( FollowFormatAllowed() )
{ {
// OD 14.03.2003 #i11760# - no nested format of follows, if // i#11760 - No nested format of follows, if
// text frame is contained in a column frame. // text frame is contained in a column frame.
// Thus, forbid intrinsic format of follow. // Thus, forbid intrinsic format of follow.
{ {
@@ -289,7 +289,7 @@ bool SwTextFrame::CalcFollow( const sal_Int32 nTextOfst )
OSL_ENSURE( !pMyFollow->GetPrev(), "SwTextFrame::CalcFollow: very cheesy follow" ); OSL_ENSURE( !pMyFollow->GetPrev(), "SwTextFrame::CalcFollow: very cheesy follow" );
} }
// OD 14.03.2003 #i11760# - reset control flag for follow format. // i#11760 - Reset control flag for follow format.
pMyFollow->AllowFollowFormat(); pMyFollow->AllowFollowFormat();
} }
@@ -405,8 +405,7 @@ void SwTextFrame::AdjustFrame( const SwTwips nChgHght, bool bHasToFit )
MakePos(); MakePos();
if ( aOldPos != Frame().Pos() ) if ( aOldPos != Frame().Pos() )
{ {
// OD 2004-07-01 #i28701# - use new method <SwFrame::InvalidateObjs(..)> // i#28701 - No format is performed for the floating screen objects.
// No format is performed for the floating screen objects.
InvalidateObjs(); InvalidateObjs();
} }
} }
@@ -439,8 +438,7 @@ void SwTextFrame::AdjustFrame( const SwTwips nChgHght, bool bHasToFit )
// We can get a bit of space in table cells, because there could be some // We can get a bit of space in table cells, because there could be some
// left through a vertical alignment to the top. // left through a vertical alignment to the top.
// #115759# - assure, that first lower in upper // Assure that first lower in upper is the current one or is valid.
// is the current one or is valid.
if ( IsInTab() && if ( IsInTab() &&
( GetUpper()->Lower() == this || ( GetUpper()->Lower() == this ||
GetUpper()->Lower()->IsValid() ) ) GetUpper()->Lower()->IsValid() ) )
@@ -642,8 +640,8 @@ SwContentFrame *SwTextFrame::JoinFrame()
pFoll->MoveFlyInCnt( this, nStart, COMPLETE_STRING ); pFoll->MoveFlyInCnt( this, nStart, COMPLETE_STRING );
pFoll->SetFootnote( false ); pFoll->SetFootnote( false );
// #i27138# // i#27138
// notify accessibility paragraphs objects about changed CONTENT_FLOWS_FROM/_TO relation. // Notify accessibility paragraphs objects about changed CONTENT_FLOWS_FROM/_TO relation.
// Relation CONTENT_FLOWS_FROM for current next paragraph will change // Relation CONTENT_FLOWS_FROM for current next paragraph will change
// and relation CONTENT_FLOWS_TO for current previous paragraph, which // and relation CONTENT_FLOWS_TO for current previous paragraph, which
// is <this>, will change. // is <this>, will change.
@@ -676,7 +674,7 @@ void SwTextFrame::SplitFrame( const sal_Int32 nTextPos )
SetFollow( pNew ); SetFollow( pNew );
pNew->Paste( GetUpper(), GetNext() ); pNew->Paste( GetUpper(), GetNext() );
// #i27138# // i#27138
// notify accessibility paragraphs objects about changed CONTENT_FLOWS_FROM/_TO relation. // notify accessibility paragraphs objects about changed CONTENT_FLOWS_FROM/_TO relation.
// Relation CONTENT_FLOWS_FROM for current next paragraph will change // Relation CONTENT_FLOWS_FROM for current next paragraph will change
// and relation CONTENT_FLOWS_TO for current previous paragraph, which // and relation CONTENT_FLOWS_TO for current previous paragraph, which
@@ -970,7 +968,7 @@ void SwTextFrame::FormatAdjust( SwTextFormatter &rLine,
!rFrameBreak.IsInside( rLine ) ) !rFrameBreak.IsInside( rLine ) )
: rFrameBreak.IsBreakNow( rLine ) ) ) ) : rFrameBreak.IsBreakNow( rLine ) ) ) )
? 1 : 0; ? 1 : 0;
// --> OD #i84870# // i#84870
// no split of text frame, which only contains a as-character anchored object // no split of text frame, which only contains a as-character anchored object
bool bOnlyContainsAsCharAnchoredObj = bool bOnlyContainsAsCharAnchoredObj =
!IsFollow() && nStrLen == 1 && !IsFollow() && nStrLen == 1 &&
@@ -985,7 +983,7 @@ void SwTextFrame::FormatAdjust( SwTextFormatter &rLine,
{ {
nNew = 0; nNew = 0;
} }
// <--
if ( nNew ) if ( nNew )
{ {
SplitFrame( nEnd ); SplitFrame( nEnd );
@@ -1062,7 +1060,7 @@ void SwTextFrame::FormatAdjust( SwTextFormatter &rLine,
{ {
// Only split frame, if the frame contains // Only split frame, if the frame contains
// content or contains no content, but has a numbering. // content or contains no content, but has a numbering.
// OD #i84870# - no split, if text frame only contains one // i#84870 - No split, if text frame only contains one
// as-character anchored object. // as-character anchored object.
if ( !bOnlyContainsAsCharAnchoredObj && if ( !bOnlyContainsAsCharAnchoredObj &&
( nStrLen > 0 || ( nStrLen > 0 ||
@@ -1290,7 +1288,7 @@ void SwTextFrame::_Format( SwTextFormatter &rLine, SwTextFormatInfo &rInf,
// Unfortunately it can: Text size changes + FlyFrames. // Unfortunately it can: Text size changes + FlyFrames.
// The backlash can affect multiple lines (Frame!)! // The backlash can affect multiple lines (Frame!)!
// #i46560# // i#46560
// FME: Yes, consider this case: (word) has to go to the next line // FME: Yes, consider this case: (word) has to go to the next line
// because) is a forbidden character at the beginning of a line although // because) is a forbidden character at the beginning of a line although
// (word would still fit on the previous line. Adding text right in front // (word would still fit on the previous line. Adding text right in front
@@ -1299,7 +1297,7 @@ void SwTextFrame::_Format( SwTextFormatter &rLine, SwTextFormatInfo &rInf,
// nevertheless it should be sufficient. // nevertheless it should be sufficient.
bool bPrev = rLine.GetPrev() && bool bPrev = rLine.GetPrev() &&
( FindBrk( rString, rLine.GetStart(), rReformat.Start() + 1 ) ( FindBrk( rString, rLine.GetStart(), rReformat.Start() + 1 )
// #i46560# // i#46560
+ 1 + 1
>= rReformat.Start() || >= rReformat.Start() ||
rLine.GetCurr()->IsRest() ); rLine.GetCurr()->IsRest() );
@@ -1829,7 +1827,7 @@ void SwTextFrame::Format( vcl::RenderContext* pRenderContext, const SwBorderAttr
{ {
SwFrame* pPre = GetPrev(); SwFrame* pPre = GetPrev();
if( pPre && if( pPre &&
// #i10826# It's the first, it cannot keep! // i#10826 It's the first, it cannot keep!
pPre->GetIndPrev() && pPre->GetIndPrev() &&
pPre->GetAttrSet()->GetKeep().GetValue() ) pPre->GetAttrSet()->GetKeep().GetValue() )
{ {
@@ -1846,7 +1844,8 @@ void SwTextFrame::Format( vcl::RenderContext* pRenderContext, const SwBorderAttr
pPara->SetPrepMustFit( false ); pPara->SetPrepMustFit( false );
CalcBaseOfstForFly(); CalcBaseOfstForFly();
_CalcHeightOfLastLine(); // #i11860# _CalcHeightOfLastLine(); // i#11860 - Adjust spacing implementation for
// object positioning - Compatibility to MS Word
} }
// bForceQuickFormat is set if GetFormatted() has been called during the // bForceQuickFormat is set if GetFormatted() has been called during the