diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-28 10:21:45 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-28 10:21:45 +0000 |
| commit | 0ed5e0fb0255dddb90171951a050f719f01a0651 (patch) | |
| tree | 4d3cceb00186e472b7e6f69e9db3c74dc875976b /sw/source/core/txtnode/atrfld.cxx | |
| parent | eb058405337c7e97e857d4e750aca0cbbc54755d (diff) | |
INTEGRATION: CWS swqbf35 (1.7.630); FILE MERGED
2005/09/22 16:59:55 fme 1.7.630.2: RESYNC: (1.7-1.8); FILE MERGED
2005/07/04 07:50:58 fme 1.7.630.1: #122919# Missing invalidation if page count field changes
Diffstat (limited to 'sw/source/core/txtnode/atrfld.cxx')
| -rw-r--r-- | sw/source/core/txtnode/atrfld.cxx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx index 62237854f4c1..115a85ee4a24 100644 --- a/sw/source/core/txtnode/atrfld.cxx +++ b/sw/source/core/txtnode/atrfld.cxx @@ -4,9 +4,9 @@ * * $RCSfile: atrfld.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: rt $ $Date: 2005-09-09 05:10:17 $ + * last change: $Author: hr $ $Date: 2005-09-28 11:21:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -45,6 +45,9 @@ #ifndef _TXTFLD_HXX //autogen #include <txtfld.hxx> #endif +#ifndef _DOCUFLD_HXX //autogen +#include <docufld.hxx> +#endif #include "reffld.hxx" #include "ddefld.hxx" #include "usrfld.hxx" @@ -289,8 +292,12 @@ void SwTxtFld::Expand() const const USHORT nWhich = pFld->GetTyp()->Which(); if( RES_CHAPTERFLD != nWhich && RES_PAGENUMBERFLD != nWhich && RES_REFPAGEGETFLD != nWhich && - ( RES_GETEXPFLD != nWhich || - ((SwGetExpField*)pFld)->IsInBodyTxt() ) ) + // --> FME 2005-05-23 #122919# Page count fields to not use aExpand + // during formatting, therefore an invalidation of the text frame + // has to be triggered even if aNewExpand == aExpand: + ( RES_DOCSTATFLD != nWhich || DS_PAGE != static_cast<const SwDocStatField*>(pFld)->GetSubType() ) && + // <-- + ( RES_GETEXPFLD != nWhich || ((SwGetExpField*)pFld)->IsInBodyTxt() ) ) { // BP: das muesste man noch optimieren! //JP 12.06.97: stimmt, man sollte auf jedenfall eine Status- |