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

INTEGRATION: CWS fmebugs01 (1.15.104); FILE MERGED

Browse source 
2004/02/09 15:13:57 fme 1.15.104.1: #i13507# Justified alignment for lines containing manual breaks
This commit is contained in:
Oliver Bolte 2004-03-17 11:50:46 +00:00
parent 807b614896
commit 07dcbed5fb
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,9 +2,9 @@
*
* $RCSfile: itradj.cxx,v $
*
* $Revision: 1.15 $
* $Revision: 1.16 $
*
* last change: $Author: rt $ $Date: 2003-12-01 17:22:20 $
* last change: $Author: obo $ $Date: 2004-03-17 12:50:46 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -192,11 +192,12 @@ void SwTxtAdjuster::CalcNewBlock( SwLineLayout *pCurr,
while( pPos )
{
if ( pPos->IsBreakPortion() && !IsLastBlock() )
// disabled for #i13507#
/* if ( pPos->IsBreakPortion() && !IsLastBlock() )
{
pCurr->FinishSpaceAdd();
break;
}
pCurr->FinishSpaceAdd();
break;
} */
if ( pPos->InTxtGrp() )
nGluePortion += ((SwTxtPortion*)pPos)->GetSpaceCnt( GetInfo(), nCharCnt );
else if( pPos->IsMultiPortion() )
@ -574,8 +575,9 @@ void SwTxtAdjuster::CalcAdjLine( SwLineLayout *pCurr )
}
case SVX_ADJUST_BLOCK:
{
// disabled for #i13507#
// 8311: In Zeilen mit LineBreaks gibt es keinen Blocksatz!
if( pCurr->GetLen() &&
/* if( pCurr->GetLen() &&
CH_BREAK == GetInfo().GetChar( nStart + pCurr->GetLen() - 1 ) &&
!IsLastBlock() )
{
@ -587,7 +589,7 @@ void SwTxtAdjuster::CalcAdjLine( SwLineLayout *pCurr )
}
return;
}
FormatBlock();
*/ FormatBlock();
break;
}
default : return;