CWS swlayoutrefactoring: resync to m100

1 files changed, 14 insertions, 9 deletions

diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx
index a72b18c75562..e2b1f5bbb97b 100644
--- a/sw/inc/reffld.hxx
+++ b/sw/inc/reffld.hxx
@@ -81,11 +81,16 @@ public:
     void MergeWithOtherDoc( SwDoc& rDestDoc );
 
     static SwTxtNode* FindAnchor( SwDoc* pDoc, const String& rRefMark,
+<<<<<<< local
                                         USHORT nSubType, USHORT nSeqNo,
                                         USHORT* pStt, USHORT* pEnd = 0 );
 protected:
     // ueberlagert, um alle Ref-Felder zu updaten
    virtual void Modify( const SfxPoolItem*, const SfxPoolItem * );
+=======
+                                        sal_uInt16 nSubType, sal_uInt16 nSeqNo,
+                                        sal_uInt16* pStt, sal_uInt16* pEnd = 0 );
+>>>>>>> other
 };
 
 /*--------------------------------------------------------------------
@@ -97,8 +102,8 @@ class SW_DLLPUBLIC SwGetRefField : public SwField
 private:
     String sSetRefName;
     String sTxt;
-    USHORT nSubType;
-    USHORT nSeqNo;
+    sal_uInt16 nSubType;
+    sal_uInt16 nSeqNo;
 
     virtual String      Expand() const;
     virtual SwField*    Copy() const;
@@ -110,7 +115,7 @@ private:
     // <--
 public:
     SwGetRefField( SwGetRefFieldType*, const String& rSetRef,
-                    USHORT nSubType, USHORT nSeqNo, ULONG nFmt );
+                    sal_uInt16 nSubType, sal_uInt16 nSeqNo, sal_uLong nFmt );
 
     virtual ~SwGetRefField();
 
@@ -130,8 +135,8 @@ public:
     void                SetExpand( const String& rStr ) { sTxt = rStr; }
 
     // SubType erfragen/setzen
-    virtual USHORT      GetSubType() const;
-    virtual void        SetSubType( USHORT n );
+    virtual sal_uInt16      GetSubType() const;
+    virtual void        SetSubType( sal_uInt16 n );
 
     // --> OD 2007-11-09 #i81002#
     bool IsRefToHeadingCrossRefBookmark() const;
@@ -143,16 +148,16 @@ public:
     // <--
 
     // SequenceNo erfragen/setzen (nur fuer REF_SEQUENCEFLD interressant)
-    USHORT              GetSeqNo() const        { return nSeqNo; }
-    void                SetSeqNo( USHORT n )    { nSeqNo = n; }
+    sal_uInt16              GetSeqNo() const        { return nSeqNo; }
+    void                SetSeqNo( sal_uInt16 n )    { nSeqNo = n; }
 
     // Name der Referenz
     virtual const String& GetPar1() const;
     virtual void        SetPar1(const String& rStr);
 
     virtual String      GetPar2() const;
-    virtual BOOL        QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const;
-    virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId );
+    virtual sal_Bool        QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const;
+    virtual sal_Bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId );
 
     void                ConvertProgrammaticToUIName();