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

Bug #90877#: ReadHeaderFooter - look and remove empty fly if nothing is inserted

Browse source
This commit is contained in:
jp 2001-08-24 08:13:21 +00:00
parent 3006acbabc
commit 6623812bbe
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
sw/source/filter/rtf/swparrtf.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: swparrtf.cxx,v $
*
* $Revision: 1.6 $
* $Revision: 1.7 $
*
* last change: $Author: jp $ $Date: 2001-08-15 08:57:54 $
* last change: $Author: jp $ $Date: 2001-08-24 09:13:21 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -2759,6 +2759,7 @@ void SwRTFParser::ReadHeaderFooter( int nToken, SwPageDesc* pPageDesc )
break;
}
USHORT nOldFlyArrCnt = aFlyArr.Count();
if( !pSttIdx )
SkipGroup();
else
@ -2812,11 +2813,22 @@ void SwRTFParser::ReadHeaderFooter( int nToken, SwPageDesc* pPageDesc )
// vom FlyFmt noch die richtigen Attribute setzen
if( pTxtAttr && RES_TXTATR_FLYCNT == pTxtAttr->Which() )
{
ASSERT( aFlyArr.Count(), "kein Fly definiert" );
SwFlySave* pFlySave = aFlyArr[ aFlyArr.Count()-1 ];
pFlySave->aFlySet.ClearItem( RES_ANCHOR );
pHdFtFmt->SetAttr( pFlySave->aFlySet );
aFlyArr.DeleteAndDestroy( aFlyArr.Count() - 1 );
// is add a new fly ?
if( nOldFlyArrCnt < aFlyArr.Count() )
{
SwFlySave* pFlySave = aFlyArr[ aFlyArr.Count()-1 ];
pFlySave->aFlySet.ClearItem( RES_ANCHOR );
pHdFtFmt->SetAttr( pFlySave->aFlySet );
aFlyArr.DeleteAndDestroy( aFlyArr.Count() - 1 );
}
else
{
// no, so remove the created textattribute
SwFrmFmt* pFlyFmt = pTxtAttr->GetFlyCnt().GetFrmFmt();
// remove the pam from the flynode
*pPam->GetPoint() = aSavePos;
pDoc->DelLayoutFmt( pFlyFmt );
}
}
bFootnoteAutoNum = FALSE; // default auf aus!