From 3e038651755b6dfbf0210dc8f2a8c3439b3280ae Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Thu, 4 Sep 2008 09:24:00 +0000 Subject: INTEGRATION: CWS swenhancedfields2 (1.17.232); FILE MERGED 2008/08/04 14:16:17 b_michaelsen 1.17.232.2: RESYNC: (1.17-1.18); FILE MERGED 2008/04/23 14:29:20 ama 1.17.232.1: #i33737#: Enhanced fields --- sw/source/filter/inc/fltshell.hxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sw/source/filter/inc/fltshell.hxx') diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx index 2b7516aca255..e1390f21fa1c 100644 --- a/sw/source/filter/inc/fltshell.hxx +++ b/sw/source/filter/inc/fltshell.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fltshell.hxx,v $ - * $Revision: 1.18 $ + * $Revision: 1.19 $ * * This file is part of OpenOffice.org. * @@ -80,6 +80,7 @@ public: BOOL bOld; // to mark Attributes *before* skipping field results BOOL bLocked; BOOL bCopied; + BOOL bConsumedByField; SwFltStackEntry(const SwPosition & rStartPos, SfxPoolItem* pHt ); SwFltStackEntry(const SwFltStackEntry& rEntry); @@ -128,7 +129,7 @@ public: void NewAttr(const SwPosition& rPos, const SfxPoolItem & rAttr ); - virtual void SetAttr(const SwPosition& rPos, USHORT nAttrId=0, BOOL bTstEnde=TRUE, long nHand = LONG_MAX); + virtual void SetAttr(const SwPosition& rPos, USHORT nAttrId=0, BOOL bTstEnde=TRUE, long nHand = LONG_MAX, BOOL consumedByField=FALSE); void StealAttr(const SwPosition* pPos, USHORT nAttrId = 0); void MarkAllAttrsOld(); -- cgit v1.2.3