diff options
Diffstat (limited to 'editors/openoffice.org-2-devel/files/patch-i69469')
| -rw-r--r-- | editors/openoffice.org-2-devel/files/patch-i69469 | 49 |
1 files changed, 37 insertions, 12 deletions
diff --git a/editors/openoffice.org-2-devel/files/patch-i69469 b/editors/openoffice.org-2-devel/files/patch-i69469 index 0aa01b88ae70..e55b3b80ac85 100644 --- a/editors/openoffice.org-2-devel/files/patch-i69469 +++ b/editors/openoffice.org-2-devel/files/patch-i69469 @@ -1,20 +1,45 @@ ---- sw/source/core/doc/docfld.cxx.orig Tue Aug 15 00:57:08 2006 -+++ sw/source/core/doc/docfld.cxx Sun Sep 17 06:16:58 2006 +--- 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, sal_uInt32 nLastNd, sal_uInt16 nLastCnt ) ++void SwDoc::FldsToCalc( SwCalc& rCalc, ULONG nLastNd, sal_uInt16 nLastCnt ) { // erzeuge die Sortierteliste aller SetFelder pUpdtFlds->MakeFldList( *this, mbNewFldLst, GETFLD_CALC ); -@@ -2243,7 +2243,7 @@ - ResetModified(); - } - --bool SwDoc::SetFieldsDirty( bool b, const SwNode* pChk, ULONG nLen ) -+bool SwDoc::SetFieldsDirty( bool b, const SwNode* pChk, sal_uInt32 nLen ) - { - // teste ggfs. mal, ob die angegbenen Nodes ueberhaupt Felder beinhalten. - // wenn nicht, braucht das Flag nicht veraendert werden. |