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

Fix #98476#: Loop with overlapping fly frames

Browse Source
This commit is contained in:
Andreas Martens
2002-07-08 07:26:15 +00:00
parent 7111ddc26b
commit 2bcc05494c
4 changed files with 32 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sw/source/core/inc/flyfrm.hxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: flyfrm.hxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: ama $ $Date: 2002-06-19 14:32:56 $
* last change: $Author: ama $ $Date: 2002-07-08 08:25:46 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -143,6 +143,7 @@ protected:
BOOL bAtCnt :1; // FLY_AT_CNTNT, am Absatz verankert
BOOL bLayout :1; // FLY_PAGE, FLY_AT_FLY, an Seite oder Rahmen
BOOL bAutoPosition :1; // FLY_AUTO_CNTNT, im Text verankerter Rahmen
BOOL bNoShrink :1; // temporary forbud of shrinking to avoid loops
friend class SwNoTxtFrm; // Darf NotifyBackground rufen
virtual void NotifyBackground( SwPageFrm *pPage,
@@ -219,6 +220,8 @@ public:
BOOL IsNotifyBack() const { return bNotifyBack; }
void SetNotifyBack() { bNotifyBack = TRUE; }
void ResetNotifyBack() { bNotifyBack = FALSE; }
BOOL IsNoShrink() const { return bNoShrink; }
void SetNoShrink( BOOL bNew ) { bNoShrink = bNew; }
BOOL IsClipped() const { return bHeightClipped || bWidthClipped; }
BOOL IsHeightClipped() const { return bHeightClipped; }

6
sw/source/core/inc/layact.hxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: layact.hxx,v $
*
* $Revision: 1.1.1.1 $
* $Revision: 1.2 $
*
* last change: $Author: hr $ $Date: 2000-09-19 00:08:21 $
* last change: $Author: ama $ $Date: 2002-07-08 08:26:15 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -148,7 +148,7 @@ class SwLayAction
void ChkFlyAnchor( SwFlyFrm *, const SwPageFrm * );
void FormatFlyLayout( const SwPageFrm * );
BOOL FormatFlyCntnt( const SwPageFrm * );
BOOL FormatFlyCntnt( const SwPageFrm *, sal_Bool bDontShrink );
BOOL _FormatFlyCntnt( const SwFlyFrm * );
BOOL __FormatFlyCntnt( const SwCntntFrm * );
void FormatFlyInCnt( SwFlyInCntFrm * );