#100000#: backout revision 1.43
This commit is contained in:
@@ -2,9 +2,9 @@
|
|||||||
*
|
*
|
||||||
* $RCSfile: atrfrm.cxx,v $
|
* $RCSfile: atrfrm.cxx,v $
|
||||||
*
|
*
|
||||||
* $Revision: 1.44 $
|
* $Revision: 1.45 $
|
||||||
*
|
*
|
||||||
* last change: $Author: hr $ $Date: 2004-03-08 13:59:41 $
|
* last change: $Author: hr $ $Date: 2004-03-08 15:46:48 $
|
||||||
*
|
*
|
||||||
* The Contents of this file are made available subject to the terms of
|
* The Contents of this file are made available subject to the terms of
|
||||||
* either of the following licenses
|
* either of the following licenses
|
||||||
@@ -1195,7 +1195,9 @@ void SwFmtCol::Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct )
|
|||||||
|
|
||||||
//Spalte 2 bis n-1 ist PrtBreite + Zwischenraumbreite
|
//Spalte 2 bis n-1 ist PrtBreite + Zwischenraumbreite
|
||||||
const sal_uInt16 nMidWidth = nPrtWidth + nGutterWidth;
|
const sal_uInt16 nMidWidth = nPrtWidth + nGutterWidth;
|
||||||
for ( sal_uInt16 i = 1; i < GetNumCols()-1; ++i )
|
sal_uInt16 i;
|
||||||
|
|
||||||
|
for ( i = 1; i < GetNumCols()-1; ++i )
|
||||||
{
|
{
|
||||||
pCol = aColumns[i];
|
pCol = aColumns[i];
|
||||||
pCol->SetWishWidth( nMidWidth );
|
pCol->SetWishWidth( nMidWidth );
|
||||||
@@ -2732,7 +2734,8 @@ sal_Bool SwFrmFmt::IsLowerOf( const SwFrmFmt& rFmt ) const
|
|||||||
while( pFlyNd )
|
while( pFlyNd )
|
||||||
{
|
{
|
||||||
// dann ueber den Anker nach oben "hangeln"
|
// dann ueber den Anker nach oben "hangeln"
|
||||||
for( sal_uInt16 n = 0; n < rFmts.Count(); ++n )
|
sal_uInt16 n;
|
||||||
|
for( n = 0; n < rFmts.Count(); ++n )
|
||||||
{
|
{
|
||||||
const SwFrmFmt* pFmt = rFmts[ n ];
|
const SwFrmFmt* pFmt = rFmts[ n ];
|
||||||
const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
|
const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
|
||||||
|
Reference in New Issue
Block a user