diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-12-14 13:47:12 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-12-14 13:47:12 +0000 |
| commit | 1fe67c25f4590225d79b97f1e577cb4666335305 (patch) | |
| tree | 01906db12831bd33d4b4db06ab8de2602fe71759 /sw/inc/usrfld.hxx | |
| parent | d6a405799e54ef0a982865aa22edc739154abb6b (diff) | |
INTEGRATION: CWS numberformat (1.4.74); FILE MERGED
2005/10/26 17:50:32 kendy 1.4.74.1: #i55546#
The ULONG -> sal_uInt32 patches related to NumberFormat extracted from ooo64bit02 CWS.
Diffstat (limited to 'sw/inc/usrfld.hxx')
| -rw-r--r-- | sw/inc/usrfld.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx index 6bc0005031c0..82717fb9aaab 100644 --- a/sw/inc/usrfld.hxx +++ b/sw/inc/usrfld.hxx @@ -4,9 +4,9 @@ * * $RCSfile: usrfld.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-09 02:30:03 $ + * last change: $Author: rt $ $Date: 2005-12-14 14:47:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -66,10 +66,10 @@ public: 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 ); void CtrlSetContent( const String& rStr ); inline BOOL IsValid() const; @@ -121,7 +121,7 @@ class SwUserField : public SwValueField 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); |