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
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
|
--- binfilter/bf_sw/source/core/swg/sw_rdflds.cxx 2006-11-22 10:11:30.000000000 +0100
+++ binfilter/bf_sw/source/core/swg/sw_rdflds.cxx 2006-11-22 10:21:16.000000000 +0100
@@ -59,7 +59,7 @@
#include "numrule.hxx"
namespace binfilter {
-static ULONG nNewFldFmt; // Aktueller Format-Wert
+static UINT32 nNewFldFmt; // Aktueller Format-Wert
static SwDBFieldType* In_SwDBFieldType( SwSwgReader& rPar )
@@ -597,7 +597,7 @@
/////////////////////////////////////////////////////////////////////////////
extern void sw3io_ConvertFromOldField( SwDoc& rDoc, USHORT& rWhich,
- USHORT& rSubType, ULONG &rFmt,
+ USHORT& rSubType, UINT32 &rFmt,
USHORT nVersion );
SwField* SwSwgReader::InField()
--- binfilter/bf_sw/source/filter/excel/excvfbff.hxx 2006-11-22 10:11:30.000000000 +0100
+++ binfilter/bf_sw/source/filter/excel/excvfbff.hxx 2006-11-22 10:13:33.000000000 +0100
@@ -38,7 +38,7 @@
#ifndef _SOLAR_H
#include <tools/solar.h>
#endif
-class String;
+class String;
namespace binfilter {
@@ -48,7 +48,7 @@
#if defined(BLC) || defined(MAC)
// BLC will es auf jeden Fall hier
typedef void ( ValueFormBuffer::*Fkt_rString )( String & );
-typedef ULONG ( ValueFormBuffer::*Fkt_USHORT )( USHORT );
+typedef sal_uInt32 ( ValueFormBuffer::*Fkt_USHORT )( USHORT );
#endif
class ValueFormBuffer
@@ -57,13 +57,13 @@
#if !defined(BLC) && !defined(MAC)
// MSC will es auf jeden Fall hier
typedef void ( ValueFormBuffer::*Fkt_rString )( String & );
- typedef ULONG ( ValueFormBuffer::*Fkt_USHORT )( USHORT );
+ typedef sal_uInt32 ( ValueFormBuffer::*Fkt_USHORT )( USHORT );
#endif
- ULONG *pHandles; // Array mit Handles...
+ sal_uInt32 *pHandles; // Array mit Handles...
USHORT nMax; // Groesse des Arrays
USHORT nCount; // Index des naechsten freien Eintrags
- ULONG nDefaultHandle;
+ sal_uInt32 nDefaultHandle;
// nur fuer Excel5
static const USHORT nAnzBuiltin; // bekannte Formate
@@ -76,11 +76,11 @@
void Init( void );
// fuer 1. Nutzung
void __NewValueFormat( String &rFormString );
- ULONG __GetValueFormat( USHORT nExcIndex );
+ sal_uInt32 __GetValueFormat( USHORT nExcIndex );
// fuer n-te Nutzung
void _NewValueFormatX( String &rFormString );
void _NewValueFormat5( String &rFormString );
- ULONG _GetValueFormatX5( USHORT nExcIndex );
+ sal_uInt32 _GetValueFormatX5( USHORT nExcIndex );
public:
ValueFormBuffer( const USHORT nSize = 2048 );
~ValueFormBuffer();
--- binfilter/bf_sw/source/filter/excel/excxfbuf.hxx 2006-11-22 10:11:30.000000000 +0100
+++ binfilter/bf_sw/source/filter/excel/excxfbuf.hxx 2006-11-22 10:14:22.000000000 +0100
@@ -208,7 +208,7 @@
inline void GetItemSets( USHORT nIndex, const SfxItemSet *pTxtAttr,
const SfxItemSet *pBoxAttr );
- ULONG GetNumFormat( USHORT nIndex );
+ sal_uInt32 GetNumFormat( USHORT nIndex );
void SetItemSets( USHORT nCol, USHORT nSR, USHORT nER,
USHORT nXF );
#ifdef USED
--- binfilter/bf_sw/source/filter/excel/sw_exctools.cxx 2006-11-22 10:11:30.000000000 +0100
+++ binfilter/bf_sw/source/filter/excel/sw_exctools.cxx 2006-11-22 10:13:33.000000000 +0100
@@ -1167,7 +1167,7 @@
}
// --------------------------------------------- XF_Buffer::GetNumFormat -
-UINT32 XF_Buffer::GetNumFormat( UINT16 nIndex )
+sal_uInt32 XF_Buffer::GetNumFormat( UINT16 nIndex )
{
// DBG_ASSERT( nIndex < nCount ,
// "+XF_Buffer::GetNumFormat(): das ist zuviel des Guten!" );
--- binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx 2006-11-22 10:11:30.000000000 +0100
+++ binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx 2006-11-22 10:22:51.000000000 +0100
@@ -5001,7 +5001,7 @@
}
extern void sw3io_ConvertFromOldField( SwDoc& rDoc, USHORT& rWhich,
- USHORT& rSubType, ULONG &rFmt,
+ USHORT& rSubType, UINT32 &rFmt,
USHORT nVersion );
BOOL Sw6Layout::InsertLine(SwDoc &rDoc,SwPaM &rPaM,String &rStg,BOOL bLast)
@@ -5329,7 +5329,7 @@
case 'U':
{
USHORT nSubType = TIMEFLD, nWhich = RES_DATETIMEFLD;
- ULONG nFormat = (ULONG)TF_SSMM_24;
+ UINT32 nFormat = (UINT32)TF_SSMM_24;
sw3io_ConvertFromOldField( rDoc, nWhich, nSubType,
nFormat, 0x0110 );
@@ -5351,7 +5351,7 @@
case 'M':eDat=DF_LMONTH; break;
}
USHORT nSubType = DATEFLD, nWhich = RES_DATETIMEFLD;
- ULONG nFormat = (ULONG)eDat;
+ UINT32 nFormat = (UINT32)eDat;
sw3io_ConvertFromOldField( rDoc, nWhich, nSubType,
nFormat, 0x0110 );
--- binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx 2006-11-22 10:11:30.000000000 +0100
+++ binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx 2006-11-22 10:15:29.000000000 +0100
@@ -1918,7 +1918,7 @@
// tell the Formatter about the new entry
UINT16 nCheckPos = 0;
INT16 nType = NUMBERFORMAT_DEFINED;
- ULONG nKey;
+ sal_uInt32 nKey;
pFormatter->PutandConvertEntry( *pFirst, nCheckPos, nType, nKey,
LANGUAGE_GERMAN,
|
