INTEGRATION: CWS swcrossref01_DEV300 (1.6.464); FILE MERGED

2008/01/09 10:13:33 od 1.6.464.8: #i85090# class <SwGetRefField>
- new method <GetExpandedTxtOfReferencedTxtNode()>
2007/12/03 13:44:08 od 1.6.464.7: #i83479# adjustment due to exported class <SwGetrefField>
2007/12/03 13:18:28 od 1.6.464.6: #i83479# class <SwGetRefField>
- export class
- introduce destructor
2007/11/22 13:36:19 od 1.6.464.5: #i83479# class <SwGetRefField>
- new methods <IsRefToHeadingCrossRefBookmark()>,
<IsRefToNumItemCrossRefBookmark()> and <GetReferencedTxtNode()>
2007/10/02 09:34:47 od 1.6.464.4: #i81002# method <SwGetRefField::MakeRefNumStr(..)>
- rename parameter to avoid variable hiding
2007/10/01 11:11:58 od 1.6.464.3: RESYNC: (1.6-1.7); FILE MERGED
2007/09/28 10:01:06 od 1.6.464.2: #i81002# method <SwGetRefField::MakeRefNumStr(..)> now constant
2007/09/17 12:05:41 od 1.6.464.1: #i81002# - enumeration <REFERENCEMARK>
-- extend by new reference format types NUMBER, NUMBER_NO_CONTEXT,
NUMBER_FULL_CONTEXT
- class <SwGetRefField>
-- new method <MakeRefNumStr(..)> for new reference format types
-- add parameter to method <UpdateField(..)>

1 files changed, 37 insertions, 4 deletions

diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx
index daa0c8d7d905..c05643e1cbf7 100644
--- a/sw/inc/reffld.hxx
+++ b/sw/inc/reffld.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: reffld.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: hr $ $Date: 2007-09-27 08:09:10 $
+ *  last change: $Author: obo $ $Date: 2008-02-26 10:31:31 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -42,6 +42,7 @@
 class SfxPoolItem;
 class SwDoc;
 class SwTxtNode;
+class SwTxtFld;
 
 enum REFERENCESUBTYPE
 {
@@ -64,6 +65,12 @@ enum REFERENCEMARK
     REF_ONLYNUMBER,
     REF_ONLYCAPTION,
     REF_ONLYSEQNO,
+    // --> OD 2007-08-24 #i81002#
+    // new reference format types for referencing bookmarks and set references
+    REF_NUMBER,
+    REF_NUMBER_NO_CONTEXT,
+    REF_NUMBER_FULL_CONTEXT,
+    // <--
     REF_END
 };
 
@@ -94,29 +101,55 @@ public:
     Beschreibung: Referenzfeld
  --------------------------------------------------------------------*/
 
-class SwGetRefField : public SwField
+class SW_DLLPUBLIC SwGetRefField : public SwField
 {
+private:
     String sSetRefName;
     String sTxt;
     USHORT nSubType;
     USHORT nSeqNo;
+
+    // --> OD 2007-08-24 #i81002#
+    String MakeRefNumStr( const SwTxtNode& rTxtNodeOfField,
+                          const SwTxtNode& rTxtNodeOfReferencedItem,
+                          const sal_uInt32 nRefNumFormat ) const;
+    // <--
 public:
     SwGetRefField( SwGetRefFieldType*, const String& rSetRef,
                     USHORT nSubType, USHORT nSeqNo, ULONG nFmt );
 
+    virtual ~SwGetRefField();
+
     virtual String      GetCntnt(BOOL bName = FALSE) const;
     virtual String      Expand() const;
     virtual SwField*    Copy() const;
 
     const String&       GetSetRefName() const { return sSetRefName; }
 
-    void                UpdateField();
+    // --> OD 2007-09-06 #i81002#
+    // The <SwTxtFld> instance, which represents the text attribute for the
+    // <SwGetRefField> instance, has to be passed to the method.
+    // This <SwTxtFld> instance is needed for the reference format type REF_UPDOWN
+    // and REF_NUMBER.
+    // Note: This instance may be NULL (field in Undo/Redo). This will cause
+    // no update for these reference format types.
+    void                UpdateField( const SwTxtFld* pFldTxtAttr );
+    // <--
     void                SetExpand( const String& rStr ) { sTxt = rStr; }
 
     // SubType erfragen/setzen
     virtual USHORT      GetSubType() const;
     virtual void        SetSubType( USHORT n );
 
+    // --> OD 2007-11-09 #i81002#
+    bool IsRefToHeadingCrossRefBookmark() const;
+    bool IsRefToNumItemCrossRefBookmark() const;
+    const SwTxtNode* GetReferencedTxtNode() const;
+    // <--
+    // --> OD 2008-01-09 #i85090#
+    String GetExpandedTxtOfReferencedTxtNode() const;
+    // <--
+
     // SequenceNo erfragen/setzen (nur fuer REF_SEQUENCEFLD interressant)
     USHORT              GetSeqNo() const        { return nSeqNo; }
     void                SetSeqNo( USHORT n )    { nSeqNo = n; }