strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS swqbf34 (1.17.96); FILE MERGED

Browse source 
2005/06/29 12:12:25 fme 1.17.96.2: #i49277# New compatibility option bDoNotJustifyLinesWithManualBreak
2005/06/27 14:06:06 fme 1.17.96.1: #i49277# New compatibility option bDoNotJustifyLinesWithManualBreak
This commit is contained in:
Oliver Bolte 2005-07-08 10:05:25 +00:00
parent afaea24d1f
commit 5d7b347527
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sw/source/core/text/itradj.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: itradj.cxx,v $
*
* $Revision: 1.17 $
* $Revision: 1.18 $
*
* last change: $Author: obo $ $Date: 2005-04-18 14:35:29 $
* last change: $Author: obo $ $Date: 2005-07-08 11:05:25 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -187,16 +187,22 @@ void SwTxtAdjuster::CalcNewBlock( SwLineLayout *pCurr,
// CalcRightMargin() setzt pCurr->Width() auf die Zeilenbreite !
CalcRightMargin( pCurr, nReal );
// --> FME 2005-06-08 #i49277#
const sal_Bool bDoNotJustifyLinesWithManualBreak =
GetTxtFrm()->GetNode()->GetDoc()->DoNotJustifyLinesWithManualBreak();
// <--
SwLinePortion *pPos = pCurr->GetPortion();
while( pPos )
{
// disabled for #i13507#
/* if ( pPos->IsBreakPortion() && !IsLastBlock() )
if ( bDoNotJustifyLinesWithManualBreak &&
pPos->IsBreakPortion() && !IsLastBlock() )
{
pCurr->FinishSpaceAdd();
break;
} */
}
if ( pPos->InTxtGrp() )
nGluePortion += ((SwTxtPortion*)pPos)->GetSpaceCnt( GetInfo(), nCharCnt );
else if( pPos->IsMultiPortion() )