diff -ur ooo_SRC680_m145_src.orig/binfilter/bf_sw/source/core/fields/sw_cellfml.cxx ooo_SRC680_m145_src/binfilter/bf_sw/source/core/fields/sw_cellfml.cxx --- ooo_SRC680_m145_src.orig/binfilter/bf_sw/source/core/fields/sw_cellfml.cxx 2005-12-09 11:13:15.000000000 +0100 +++ ooo_SRC680_m145_src/binfilter/bf_sw/source/core/fields/sw_cellfml.cxx 2005-12-09 12:14:17.000000000 +0100 @@ -267,7 +267,7 @@ /*N*/ /*N*/ double aNum; /*N*/ String sTxt( rTxt.Copy( nSttPos ) ); -/*N*/ ULONG nFmtIndex = GetFrmFmt()->GetTblBoxNumFmt().GetValue(); +/*N*/ sal_uInt32 nFmtIndex = GetFrmFmt()->GetTblBoxNumFmt().GetValue(); /*N*/ /*N*/ SvNumberFormatter* pNumFmtr = pDoc->GetNumberFormatter(); /*N*/ @@ -277,7 +277,7 @@ /*?*/ else if( sTxt.Len() && /*?*/ NUMBERFORMAT_PERCENT == pNumFmtr->GetType( nFmtIndex )) /*?*/ { -/*?*/ ULONG nTmpFmt = 0; +/*?*/ sal_uInt32 nTmpFmt = 0; /*?*/ if( pNumFmtr->IsNumberFormat( sTxt, nTmpFmt, aNum ) && /*?*/ NUMBERFORMAT_NUMBER == pNumFmtr->GetType( nTmpFmt )) /*?*/ sTxt += '%'; diff -ur ooo_SRC680_m145_src.orig/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx ooo_SRC680_m145_src/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx --- ooo_SRC680_m145_src.orig/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx 2005-12-09 11:13:15.000000000 +0100 +++ ooo_SRC680_m145_src/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx 2005-12-09 12:27:37.000000000 +0100 @@ -124,7 +124,7 @@ using namespace ::com::sun::star; -/*N*/ USHORT lcl_GetLanguageOfFormat( USHORT nLng, ULONG nFmt, +/*N*/ USHORT lcl_GetLanguageOfFormat( USHORT nLng, sal_uInt32 nFmt, /*N*/ const SvNumberFormatter& rFormatter ) /*N*/ { /*N*/ if( nLng == LANGUAGE_NONE ) // wegen Bug #60010 @@ -249,7 +249,7 @@ Felder sind n-mal vorhanden, Feldtypen nur einmal --------------------------------------------------------------------*/ -/*N*/ SwField::SwField(SwFieldType* pTyp, ULONG nFmt, USHORT nLng) : +/*N*/ SwField::SwField(SwFieldType* pTyp, sal_uInt32 nFmt, USHORT nLng) : /*N*/ nFormat(nFmt), /*N*/ nLang(nLng), /*N*/ bIsAutomaticLanguage(TRUE) @@ -707,7 +707,7 @@ --------------------------------------------------------------------*/ /*N*/ String SwValueFieldType::ExpandValue( const double& rVal, -/*N*/ ULONG nFmt, USHORT nLng) const +/*N*/ sal_uInt32 nFmt, USHORT nLng) const /*N*/ { /*N*/ if (rVal >= DBL_MAX) // FehlerString fuer Calculator /*?*/ return ViewShell::GetShellRes()->aCalc_Error; @@ -793,7 +793,7 @@ Beschreibung: CTOR SwValueField --------------------------------------------------------------------*/ -/*N*/ SwValueField::SwValueField( SwValueFieldType* pFldType, ULONG nFmt, +/*N*/ SwValueField::SwValueField( SwValueFieldType* pFldType, sal_uInt32 nFmt, /*N*/ USHORT nLang, const double fVal ) /*N*/ : SwField(pFldType, nFmt, nLang), /*N*/ fValue(fVal) @@ -899,7 +899,7 @@ /*N*/ /*N*/ if( pEntry && nFmtLng != pEntry->GetLanguage() ) /*N*/ { -/*N*/ ULONG nNewFormat = pFormatter->GetFormatForLanguageIfBuiltIn( +/*N*/ sal_uInt32 nNewFormat = pFormatter->GetFormatForLanguageIfBuiltIn( /*N*/ GetFormat(), (LanguageType)nFmtLng ); /*N*/ /*N*/ if( nNewFormat == GetFormat() ) @@ -940,7 +940,7 @@ Beschreibung: SwFormulaField --------------------------------------------------------------------*/ -/*N*/ SwFormulaField::SwFormulaField( SwValueFieldType* pFldType, ULONG nFmt, const double fVal) +/*N*/ SwFormulaField::SwFormulaField( SwValueFieldType* pFldType, sal_uInt32 nFmt, const double fVal) /*N*/ : SwValueField(pFldType, nFmt, LANGUAGE_SYSTEM, fVal) /*N*/ { /*N*/ } @@ -968,7 +968,7 @@ /*N*/ { /*N*/ sFormula = rStr; /*N*/ -/*N*/ ULONG nFmt(GetFormat()); +/*N*/ sal_uInt32 nFmt(GetFormat()); /*N*/ /*N*/ if( nFmt && ULONG_MAX != nFmt ) /*N*/ { @@ -985,7 +985,7 @@ void SwFormulaField::SetExpandedFormula( const String& rStr ) { - ULONG nFmt(GetFormat()); + sal_uInt32 nFmt(GetFormat()); if (nFmt && nFmt != ULONG_MAX && ((SwValueFieldType *)GetTyp())->UseFormat()) { @@ -1011,7 +1011,7 @@ String SwFormulaField::GetExpandedFormula() const { - ULONG nFmt(GetFormat()); + sal_uInt32 nFmt(GetFormat()); if (nFmt && nFmt != ULONG_MAX && ((SwValueFieldType *)GetTyp())->UseFormat()) { diff -ur ooo_SRC680_m145_src.orig/binfilter/inc/bf_sw/chpfld.hxx ooo_SRC680_m145_src/binfilter/inc/bf_sw/chpfld.hxx --- ooo_SRC680_m145_src.orig/binfilter/inc/bf_sw/chpfld.hxx 2005-12-09 11:13:17.000000000 +0100 +++ ooo_SRC680_m145_src/binfilter/inc/bf_sw/chpfld.hxx 2005-12-09 12:15:33.000000000 +0100 @@ -80,7 +80,7 @@ BYTE nLevel; String sTitle, sNumber, sPre, sPost; public: - SwChapterField(SwChapterFieldType*, ULONG nFmt = 0); + SwChapterField(SwChapterFieldType*, sal_uInt32 nFmt = 0); void ChangeExpansion( const SwFrm*, const SwTxtNode*, BOOL bSrchNum = FALSE); diff -ur ooo_SRC680_m145_src.orig/binfilter/inc/bf_sw/docufld.hxx ooo_SRC680_m145_src/binfilter/inc/bf_sw/docufld.hxx --- ooo_SRC680_m145_src.orig/binfilter/inc/bf_sw/docufld.hxx 2005-12-09 11:13:17.000000000 +0100 +++ ooo_SRC680_m145_src/binfilter/inc/bf_sw/docufld.hxx 2005-12-09 12:21:31.000000000 +0100 @@ -158,7 +158,7 @@ public: SwPageNumberFieldType(); - String& Expand( ULONG nFmt, short nOff, const String&, String& rRet ) const; + String& Expand( sal_uInt32 nFmt, short nOff, const String&, String& rRet ) const; void ChangeExpansion( SwDoc* pDoc, USHORT nNum, USHORT nMax, BOOL bVirtPageNum, const sal_Int16* pNumFmt = 0 ); inline sal_Int16 GetNumFormat() const { return nNumberingType; } @@ -177,7 +177,7 @@ public: SwPageNumberField(SwPageNumberFieldType*, USHORT nSub = PG_RANDOM, - ULONG nFmt = 0, short nOff = 0); + sal_uInt32 nFmt = 0, short nOff = 0); virtual String Expand() const; virtual SwField* Copy() const; @@ -203,7 +203,7 @@ public: SwAuthorFieldType(); - String Expand(ULONG) const; + String Expand(sal_uInt32) const; virtual SwFieldType* Copy() const; }; @@ -216,7 +216,7 @@ String aContent; public: - SwAuthorField(SwAuthorFieldType*, ULONG nFmt = 0); + SwAuthorField(SwAuthorFieldType*, sal_uInt32 nFmt = 0); virtual String Expand() const; virtual SwField* Copy() const; @@ -238,7 +238,7 @@ public: SwFileNameFieldType(SwDoc*); - String Expand(ULONG) const; + String Expand(sal_uInt32) const; virtual SwFieldType* Copy() const; }; @@ -251,7 +251,7 @@ String aContent; public: - SwFileNameField(SwFileNameFieldType*, ULONG nFmt = 0); + SwFileNameField(SwFileNameFieldType*, sal_uInt32 nFmt = 0); virtual String Expand() const; virtual SwField* Copy() const; @@ -273,7 +273,7 @@ public: SwTemplNameFieldType(SwDoc*); - String Expand(ULONG) const; + String Expand(sal_uInt32) const; virtual SwFieldType* Copy() const; }; @@ -284,7 +284,7 @@ class SwTemplNameField : public SwField { public: - SwTemplNameField(SwTemplNameFieldType*, ULONG nFmt = 0); + SwTemplNameField(SwTemplNameFieldType*, sal_uInt32 nFmt = 0); virtual String Expand() const; virtual SwField* Copy() const; @@ -304,7 +304,7 @@ public: SwDocStatFieldType(SwDoc*); - String Expand(USHORT nSubType, ULONG nFmt) const; + String Expand(USHORT nSubType, sal_uInt32 nFmt) const; virtual SwFieldType* Copy() const; inline sal_Int16 GetNumFormat() const { return nNumberingType; } @@ -321,7 +321,7 @@ public: SwDocStatField( SwDocStatFieldType*, - USHORT nSubType = 0, ULONG nFmt = 0); + USHORT nSubType = 0, sal_uInt32 nFmt = 0); void ChangeExpansion( const SwFrm* pFrm ); @@ -552,7 +552,7 @@ public: SwDocInfoFieldType(SwDoc* pDc); - String Expand(USHORT nSubType, ULONG nFormat, USHORT nLang) const; + String Expand(USHORT nSubType, sal_uInt32 nFormat, USHORT nLang) const; virtual SwFieldType* Copy() const; }; @@ -562,7 +562,7 @@ String aContent; public: - SwDocInfoField(SwDocInfoFieldType*, USHORT nSub, ULONG nFmt=0); + SwDocInfoField(SwDocInfoFieldType*, USHORT nSub, sal_uInt32 nFmt=0); virtual void SetSubType(USHORT); virtual USHORT GetSubType() const; @@ -590,7 +590,7 @@ inline const String& GetData() const { return aData; } inline void SetData(const String& rStr) { aData = rStr; } - String Expand(USHORT nSubType, ULONG nFormat) const; + String Expand(USHORT nSubType, sal_uInt32 nFormat) const; virtual SwFieldType* Copy() const; }; @@ -600,7 +600,7 @@ USHORT nType; public: - SwExtUserField(SwExtUserFieldType*, USHORT nSub, ULONG nFmt=0); + SwExtUserField(SwExtUserFieldType*, USHORT nSub, sal_uInt32 nFmt=0); virtual String Expand() const; virtual SwField* Copy() const; @@ -690,7 +690,7 @@ { String sTxt; public: - SwRefPageGetField( SwRefPageGetFieldType*, ULONG nFmt ); + SwRefPageGetField( SwRefPageGetFieldType*, sal_uInt32 nFmt ); virtual String Expand() const; virtual SwField* Copy() const; @@ -726,7 +726,7 @@ { String sTxt, sHelp; public: - SwJumpEditField( SwJumpEditFieldType*, ULONG nFormat, + SwJumpEditField( SwJumpEditFieldType*, sal_uInt32 nFormat, const String& sText, const String& sHelp ); virtual String Expand() const; diff -ur ooo_SRC680_m145_src.orig/binfilter/inc/bf_sw/fldbas.hxx ooo_SRC680_m145_src/binfilter/inc/bf_sw/fldbas.hxx --- ooo_SRC680_m145_src.orig/binfilter/inc/bf_sw/fldbas.hxx 2005-12-09 11:13:17.000000000 +0100 +++ ooo_SRC680_m145_src/binfilter/inc/bf_sw/fldbas.hxx 2005-12-09 12:25:33.000000000 +0100 @@ -336,7 +336,7 @@ protected: void SetFormat(ULONG nSet) {nFormat = nSet;} - SwField(SwFieldType* pTyp, ULONG nFmt = 0, USHORT nLang = LANGUAGE_SYSTEM); + SwField(SwFieldType* pTyp, sal_uInt32 nFmt = 0, USHORT nLang = LANGUAGE_SYSTEM); public: virtual ~SwField(); @@ -423,7 +423,7 @@ inline BOOL UseFormat() const { return bUseFormat; } inline void EnableFormat(BOOL bFormat = TRUE) { bUseFormat = bFormat; } - String ExpandValue(const double& rVal, ULONG nFmt, USHORT nLng=0) const; + String ExpandValue(const double& rVal, sal_uInt32 nFmt, USHORT nLng=0) const; void DoubleToString(String &rValue, const double &rVal, LanguageType eLng) const; //STRIP001 void DoubleToString(String &rValue, const double &rVal, ULONG nFmt) const; }; @@ -434,7 +434,7 @@ // String sExpand; protected: - SwValueField( SwValueFieldType* pFldType, ULONG nFmt = 0, USHORT nLang = LANGUAGE_SYSTEM, const double fVal = 0.0 ); + SwValueField( SwValueFieldType* pFldType, sal_uInt32 nFmt = 0, USHORT nLang = LANGUAGE_SYSTEM, const double fVal = 0.0 ); //STRIP001 SwValueField( const SwValueField& rFld ); public: @@ -450,7 +450,7 @@ virtual double GetValue() const; virtual void SetValue( const double& rVal ); - inline String ExpandValue(const double& rVal, ULONG nFmt, USHORT nLng=0) const + inline String ExpandValue(const double& rVal, sal_uInt32 nFmt, USHORT nLng=0) const { return ((SwValueFieldType*)GetTyp())->ExpandValue(rVal, nFmt, nLng); } //STRIP001 static ULONG GetSystemFormat(SvNumberFormatter* pFormatter, ULONG nFmt); @@ -461,7 +461,7 @@ String sFormula; protected: - SwFormulaField( SwValueFieldType* pFldType, ULONG nFmt = 0, const double fVal = 0.0 ); + SwFormulaField( SwValueFieldType* pFldType, sal_uInt32 nFmt = 0, const double fVal = 0.0 ); //STRIP001 SwFormulaField( const SwFormulaField& rFld ); public: diff -ur ooo_SRC680_m145_src.orig/binfilter/inc/bf_sw/usrfld.hxx ooo_SRC680_m145_src/binfilter/inc/bf_sw/usrfld.hxx --- ooo_SRC680_m145_src.orig/binfilter/inc/bf_sw/usrfld.hxx 2005-12-09 11:13:17.000000000 +0100 +++ ooo_SRC680_m145_src/binfilter/inc/bf_sw/usrfld.hxx 2005-12-09 12:28:23.000000000 +0100 @@ -62,10 +62,10 @@ virtual const String& GetName() const; virtual SwFieldType* Copy() const; - String Expand(ULONG nFmt, USHORT nSubType, USHORT nLng); + String Expand(sal_uInt32 nFmt, USHORT nSubType, USHORT nLng); - String GetContent( ULONG nFmt = 0 ); - void SetContent( const String& rStr, ULONG nFmt = 0 ); + String GetContent( sal_uInt32 nFmt = 0 ); + void SetContent( const String& rStr, sal_uInt32 nFmt = 0 ); //STRIP001 void CtrlSetContent( const String& rStr ); inline BOOL IsValid() const; @@ -117,7 +117,7 @@ USHORT nSubType; public: - SwUserField(SwUserFieldType*, USHORT nSub = 0, ULONG nFmt = 0); + SwUserField(SwUserFieldType*, USHORT nSub = 0, sal_uInt32 nFmt = 0); virtual USHORT GetSubType() const; virtual void SetSubType(USHORT nSub);