aboutsummaryrefslogtreecommitdiffstats
path: root/editors/openoffice-3-devel/files/patch-i69469
blob: e55b3b80ac856a3296337e3599b9564ce8bb855d (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
--- sw/inc/IDocumentFieldsAccess.hxx.orig   Mon Aug 14 11:12:27 2006
+++ sw/inc/IDocumentFieldsAccess.hxx    Thu Sep 21 18:10:10 2006
@@ -189,7 +189,7 @@
        SwNode (see parameter pChk) is (?) part of the private
        data structure of SwDoc and should not be exposed
    */
-   virtual bool SetFieldsDirty(bool b, const SwNode* pChk, sal_uInt32 nLen) = 0;
+   virtual bool SetFieldsDirty(bool b, const SwNode* pChk, ULONG nLen) = 0;
 
     /**
     */
@@ -200,7 +200,7 @@
    // eine erzeugte Liste aller Felder mit uebergegeben werden.
    // (ist die Adresse != 0, und der Pointer == 0 wird eine neue
    // Liste returnt.)
-   virtual void FldsToCalc(SwCalc& rCalc, sal_uInt32 nLastNd, sal_uInt16 nLastCntnt) = 0;
+   virtual void FldsToCalc(SwCalc& rCalc, ULONG nLastNd, sal_uInt16 nLastCnt) = 0;
 
     /**
     */
--- sw/inc/doc.hxx.orig Thu Sep 21 18:11:45 2006
+++ sw/inc/doc.hxx  Thu Sep 21 18:11:01 2006
@@ -838,9 +838,9 @@
     virtual void UnlockExpFlds();
     virtual bool IsExpFldsLocked() const;
     virtual SwDocUpdtFld& GetUpdtFlds() const;
-   virtual bool SetFieldsDirty(bool b, const SwNode* pChk, sal_uInt32 nLen);
+   virtual bool SetFieldsDirty(bool b, const SwNode* pChk, ULONG nLen);
    virtual void SetFixFields(bool bOnlyTimeDate, const DateTime* pNewDateTime);
-   virtual void FldsToCalc(SwCalc& rCalc, sal_uInt32 nLastNd, sal_uInt16 nLastCntnt);
+   virtual void FldsToCalc(SwCalc& rCalc, ULONG nLastNd, sal_uInt16 nLastCnt);
    virtual void FldsToCalc(SwCalc& rCalc, const _SetGetExpFld& rToThisFld);
    virtual void FldsToExpand(SwHash**& ppTbl, sal_uInt16& rTblSize, const _SetGetExpFld& rToThisFld);
    virtual bool IsNewFldLst() const;
--- sw/source/core/doc/docfld.cxx.orig  Thu Sep 21 17:49:14 2006
+++ sw/source/core/doc/docfld.cxx   Thu Sep 21 12:36:17 2006
@@ -1223,7 +1223,7 @@
    pMgr->CloseAll(FALSE);
 }
 
-void SwDoc::FldsToCalc( SwCalc& rCalc, ULONG nLastNd, USHORT nLastCnt )
+void SwDoc::FldsToCalc( SwCalc& rCalc, ULONG nLastNd, sal_uInt16 nLastCnt )
 {
    // erzeuge die Sortierteliste aller SetFelder
    pUpdtFlds->MakeFldList( *this, mbNewFldLst, GETFLD_CALC );