summaryrefslogtreecommitdiff
path: root/sc/inc/zforauto.hxx
diff options
context:
space:
mode:
authorKohei Yoshida <kyoshida@novell.com>2011-03-10 16:55:21 -0500
committerKohei Yoshida <kyoshida@novell.com>2011-03-10 20:21:13 -0500
commit12343c15568dcc2c9209d8ca41fda2263122448f (patch)
tree3212a89c6cd8ea2e0aee7103aa9669bbb8a6f307 /sc/inc/zforauto.hxx
parent99745dbcbb25b61437914c9782475d0b67a4b0bd (diff)
parentce6308e4fad2281241bf4ca78280eba29f744d43 (diff)
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/inc/zforauto.hxx')
-rw-r--r--sc/inc/zforauto.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/inc/zforauto.hxx b/sc/inc/zforauto.hxx
index 2c695ae5b0e0..878971e40b35 100644
--- a/sc/inc/zforauto.hxx
+++ b/sc/inc/zforauto.hxx
@@ -45,11 +45,11 @@ class ScNumFormatAbbrev
public:
ScNumFormatAbbrev();
ScNumFormatAbbrev(const ScNumFormatAbbrev& aFormat);
- ScNumFormatAbbrev(ULONG nFormat, SvNumberFormatter& rFormatter);
+ ScNumFormatAbbrev(sal_uLong nFormat, SvNumberFormatter& rFormatter);
void Load( SvStream& rStream, CharSet eByteStrSet ); // Laden der Zahlenformate
void Save( SvStream& rStream, CharSet eByteStrSet ) const; // Speichern der Zahlenformate
- void PutFormatIndex(ULONG nFormat, SvNumberFormatter& rFormatter);
- ULONG GetFormatIndex( SvNumberFormatter& rFormatter);
+ void PutFormatIndex(sal_uLong nFormat, SvNumberFormatter& rFormatter);
+ sal_uLong GetFormatIndex( SvNumberFormatter& rFormatter);
inline int operator==(const ScNumFormatAbbrev& rNumFormat) const
{
return ((sFormatstring == rNumFormat.sFormatstring)