diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-28 14:17:17 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-28 14:17:17 +0000 |
| commit | 745f1b1332d4e37624ae4398d6818cc6fc39cf57 (patch) | |
| tree | d5e8405dcd45dee255609dedf26152f631c1ceae /sw/source/core/inc/layact.hxx | |
| parent | d136b94762ab679a4a14c7cf89812d55ce80e2e4 (diff) | |
INTEGRATION: CWS apps61beta2 (1.3.156); FILE MERGED
2003/04/14 11:35:32 od 1.3.156.2: #106346# class <SwLayAction> - rename flag for content formatting on interrupt
2003/04/14 11:23:05 od 1.3.156.1: #106346# class <SwLayAction> - add new flag for formatting for an interrupt
Diffstat (limited to 'sw/source/core/inc/layact.hxx')
| -rw-r--r-- | sw/source/core/inc/layact.hxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx index 9e5f8c8908d4..0a9f8340f4a7 100644 --- a/sw/source/core/inc/layact.hxx +++ b/sw/source/core/inc/layact.hxx @@ -2,9 +2,9 @@ * * $RCSfile: layact.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: hbrinkm $ $Date: 2002-11-01 15:31:34 $ + * last change: $Author: hr $ $Date: 2003-04-28 15:17:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -136,6 +136,8 @@ class SwLayAction BOOL bPaintExtraData; //Anzeige von Zeilennumerierung o. ae. eingeschaltet? BOOL bActionInProgress; // wird in Action() anfangs gesetzt und zum Schluss geloescht + // OD 14.04.2003 #106346# - new flag for content formatting on interrupt. + sal_Bool mbFormatCntntOnInterrupt; #ifdef _LAYACT_CXX void _AddScrollRect( const SwCntntFrm *, const SwPageFrm *, @@ -153,12 +155,13 @@ class SwLayAction BOOL FormatFlyCntnt( const SwPageFrm *, sal_Bool bDontShrink ); BOOL _FormatFlyCntnt( const SwFlyFrm * ); BOOL __FormatFlyCntnt( const SwCntntFrm * ); - void FormatFlyInCnt( SwFlyInCntFrm * ); + void FormatFlyInCnt( SwFlyInCntFrm* ); BOOL FormatLayout( SwLayoutFrm *, BOOL bAddRect = TRUE ); BOOL FormatLayoutTab( SwTabFrm *, BOOL bAddRect = TRUE ); BOOL FormatLayoutFly( SwFlyFrm *, BOOL bAddRect = TRUE ); - BOOL FormatCntnt( const SwPageFrm * ); - void _FormatCntnt( const SwCntntFrm *, const SwPageFrm *pPage ); + BOOL FormatCntnt( const SwPageFrm* pPage ); + void _FormatCntnt( const SwCntntFrm* pCntnt, + const SwPageFrm* pPage ); BOOL IsShortCut( SwPageFrm *& ); BOOL TurboAction(); |