Commits

Anonymous committed 0a470e4

INTEGRATION: CWS swenhancedfields2 (1.154.76); FILE MERGED
2008/08/04 14:14:59 b_michaelsen 1.154.76.3: RESYNC: (1.154-1.157); FILE MERGED
2008/04/24 13:41:55 ama 1.154.76.2: #33737#: Enhanced fields
2008/04/23 14:29:21 ama 1.154.76.1: #i33737#: Enhanced fields

Comments (0)

Files changed (1)

sw/source/filter/ww8/ww8par.hxx

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ww8par.hxx,v $
- * $Revision: 1.158 $
+ * $Revision: 1.159 $
  *
  * This file is part of OpenOffice.org.
  *
 
     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 SetToggleAttr(BYTE nId, bool bOn)
     {
     void Swap(FieldEntry &rOther) throw();
 };
 
+class WW8NewFieldCtx
+{
+private:
+	SwNodeIndex maPtNode;
+    xub_StrLen mnPtCntnt;
+	::rtl::OUString sBookmarkName;
+	::rtl::OUString sBookmarkType;
+	typedef ::std::pair< ::rtl::OUString, ::rtl::OUString> Param_t;
+	typedef ::std::vector< Param_t > Params_t;
+	Params_t maParams;
+  SwPaM * mpPaM;
+
+public:
+	WW8NewFieldCtx(SwPosition &aStartPos, ::rtl::OUString sBookmarkName, ::rtl::OUString sBookmarkType);
+	~WW8NewFieldCtx();
+
+	SwNodeIndex GetPtNode() { return maPtNode; };
+	xub_StrLen GetPtCntnt() { return mnPtCntnt; };
+	::rtl::OUString GetBookmarkName();
+	::rtl::OUString GetBookmarkType();
+	void AddParam(::rtl::OUString name, ::rtl::OUString value);
+	void SetCurrentFieldParamsTo(SwFieldBookmark &rFieldBookmark);
+
+};
+
+
 //-----------------------------------------
 //    Mini-Merker fuer einige Flags
 //-----------------------------------------
     bool mbWasParaEnd;
     bool mbHasBorder;
     bool mbFirstPara;
+	std::deque<WW8NewFieldCtx *> maFieldCtxStack;
 public:
     WW8ReaderSave(SwWW8ImplReader* pRdr, WW8_CP nStart=-1);
     void Restore(SwWW8ImplReader* pRdr);
     std::deque<FieldEntry> maFieldStack;
     typedef std::deque<FieldEntry>::const_iterator mycFieldIter;
 
+	typedef std::deque<WW8NewFieldCtx *> WW8NewFieldCtxStack_t;
+	WW8NewFieldCtxStack_t maNewFieldCtxStack;
+
     /*
     A stack of open footnotes. Should only be one in it at any time.
     */
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.