]> git.pld-linux.org Git - packages/abiword.git/blame - abiword-types.patch
projects / packages / abiword.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- new
[packages/abiword.git] / abiword-types.patch
CommitLineData
d8cd6cb2
JB		 1--- abiword-2.0.1/abi/src/af/xap/xp/xap_Draw_Symbol.cpp.orig 2003-05-07 17:40:40.000000000 +0000
2+++ abiword-2.0.1/abi/src/af/xap/xp/xap_Draw_Symbol.cpp 2003-10-30 13:19:59.000000000 +0000
3@@ -153,7 +153,7 @@
4
5 for (i = 0; i < m_vCharSet.size(); i += 2)
6 {
7- UT_UCSChar base = static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(m_vCharSet[i]));
8+ UT_UCSChar base = static_cast<UT_UCSChar>(reinterpret_cast<size_t>(m_vCharSet[i]));
9 size_t nb_chars = reinterpret_cast<size_t>(m_vCharSet[i + 1]);
10
11 for (UT_UCSChar j = base; j < base + nb_chars; ++j)
12@@ -194,11 +194,11 @@
13 UT_DEBUGMSG(("calcSymbolFromCoords(x = [%u], y = [%u]) =", ix, iy));
14 for (size_t i = 0; i < m_vCharSet.size(); i += 2)
15 {
16- count += reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]);
17+ count += reinterpret_cast<size_t>(m_vCharSet[i + 1]);
18 if (count > index)
19 {
20- UT_DEBUGMSG((" %u\n", static_cast<UT_uint32>(reinterpret_cast<UT_uint32>(m_vCharSet[i]) + index - count + reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]))));
21- return static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(m_vCharSet[i]) + index - count + reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]));
22+ UT_DEBUGMSG((" %u\n", static_cast<UT_uint32>(reinterpret_cast<size_t>(m_vCharSet[i]) + index - count + reinterpret_cast<size_t>(m_vCharSet[i + 1]))));
23+ return static_cast<UT_UCSChar>(reinterpret_cast<size_t>(m_vCharSet[i]) + index - count + reinterpret_cast<size_t>(m_vCharSet[i + 1]));
24 }
25 }
26
27@@ -227,8 +227,8 @@
28
29 for (size_t i = 0; i < m_vCharSet.size(); i += 2)
30 {
31- UT_uint32 base = reinterpret_cast<UT_uint32>(m_vCharSet[i]);
32- UT_uint32 size = reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]);
33+ UT_uint32 base = reinterpret_cast<size_t>(m_vCharSet[i]);
34+ UT_uint32 size = reinterpret_cast<size_t>(m_vCharSet[i + 1]);
35
36 if (base + size > c)
37 {
38--- abiword-2.0.1/abi/src/af/xap/unix/xap_UnixFont.cpp.orig 2003-08-22 20:52:07.000000000 +0000
39+++ abiword-2.0.1/abi/src/af/xap/unix/xap_UnixFont.cpp 2003-10-30 13:31:22.000000000 +0000
40@@ -400,10 +400,10 @@
41 size_t idx = 0;
42 for (size_t i = 0; i < coverage.size(); i += 2)
43 {
44- UT_UCSChar c1 = static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(coverage[i]));
45+ UT_UCSChar c1 = static_cast<UT_UCSChar>(reinterpret_cast<size_t>(coverage[i]));
46 UT_UCSChar c2 =
47 static_cast<UT_UCSChar>(static_cast<UT_uint32>(c1)) +
48- static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(coverage[i + 1]));
49+ static_cast<UT_UCSChar>(reinterpret_cast<size_t>(coverage[i + 1]));
50 for (UT_UCSChar c = c1; c < c2; ++c)
51 {
52 FT_UInt glyph_idx = FT_Get_Char_Index(face, c);
53--- abiword-2.0.1/abi/src/wp/impexp/xp/ie_exp_HTML.cpp.orig 2003-09-23 09:34:59.000000000 +0000
54+++ abiword-2.0.1/abi/src/wp/impexp/xp/ie_exp_HTML.cpp 2003-10-30 13:58:22.000000000 +0000
55@@ -777,7 +777,7 @@
56 void * vptr = 0;
57 m_tagStack.pop (&vptr);
58
59- if (reinterpret_cast<UT_uint32>(vptr) == tagID) return;
60+ if (static_cast<UT_uint32>(reinterpret_cast<size_t>(vptr)) == tagID) return;
61
62 UT_DEBUGMSG(("WARNING: possible tag mis-match in XHTML output!\n"));
63 }
64@@ -821,7 +821,7 @@
65 UT_uint32 s_HTML_Listener::tagTop ()
66 {
67 void * vptr = 0;
68- if (m_tagStack.viewTop (&vptr)) return reinterpret_cast<UT_uint32>(vptr);
69+ if (m_tagStack.viewTop (&vptr)) return static_cast<UT_uint32>(reinterpret_cast<size_t>(vptr));
70 return 0;
71 }
72
73@@ -1898,7 +1898,7 @@
74 {
75 void * vptr = 0;
76 m_utsListType.viewTop (&vptr);
77- return static_cast<UT_uint16>(reinterpret_cast<UT_uint32>(vptr));
78+ return static_cast<UT_uint16>(reinterpret_cast<size_t>(vptr));
79 }
80
81 void s_HTML_Listener::listPush (UT_uint16 type, const char * ClassName)
82@@ -1937,7 +1937,7 @@
83
84 void * vptr = 0;
85 m_utsListType.pop (&vptr);
86- UT_uint16 type = static_cast<UT_uint16>(reinterpret_cast<UT_uint32>(vptr));
87+ UT_uint16 type = static_cast<UT_uint16>(reinterpret_cast<size_t>(vptr));
88
89 UT_uint32 tagID;
90
91--- abiword-2.0.1/abi/src/wp/impexp/xp/ie_Table.cpp.orig 2003-08-25 01:45:11.000000000 +0000
92+++ abiword-2.0.1/abi/src/wp/impexp/xp/ie_Table.cpp 2003-10-30 14:31:50.000000000 +0000
93@@ -1028,7 +1028,7 @@
94 UT_sint32 j = 0;
95 for(j=0; !bMatch && (j < static_cast<UT_sint32>(m_vecCellX.getItemCount())); j++)
96 {
97- UT_sint32 prevX = reinterpret_cast<UT_sint32>(m_vecCellX.getNthItem(j));
98+ UT_sint32 prevX = static_cast<UT_sint32>(reinterpret_cast<size_t>(m_vecCellX.getNthItem(j)));
99 UT_DEBUGMSG(("Prev cell %d cellx %d \n",j,prevX));
100 bool bLast = ((j-1) == szCurRow);
101 bMatch = doCellXMatch(prevX,curX,bLast);
102@@ -1179,7 +1179,7 @@
103 sColWidth.clear();
104 for(i=0; i< static_cast<UT_sint32>(m_vecCellX.getItemCount()); i++)
105 {
106- UT_sint32 iCellx = reinterpret_cast<UT_sint32>(m_vecCellX.getNthItem(i));
107+ UT_sint32 iCellx = static_cast<UT_sint32>(reinterpret_cast<size_t>(m_vecCellX.getNthItem(i)));
108 xxx_UT_DEBUGMSG(("final cellx import cellx %d iPrev %x \n",iCellx,iPrev));
109 UT_sint32 iDiffCellx = iCellx - iPrev;
110 double dCellx = static_cast<double>(iDiffCellx)/1440.0 -dColSpace;
111@@ -1377,7 +1377,7 @@
112 UT_sint32 iSub = 0;
113 for(i=0; !bFound && (i< static_cast<UT_sint32>(m_vecCellX.getItemCount())); i++)
114 {
115- UT_sint32 icellx = reinterpret_cast<UT_sint32>(m_vecCellX.getNthItem(i));
116+ UT_sint32 icellx = static_cast<UT_sint32>(reinterpret_cast<size_t>(m_vecCellX.getNthItem(i)));
117 if(icellx == -1)
118 {
119 iSub++;
120--- abiword-2.0.1/abi/src/wp/impexp/xp/ie_imp_RTF.cpp.orig 2003-09-19 08:03:26.000000000 +0000
121+++ abiword-2.0.1/abi/src/wp/impexp/xp/ie_imp_RTF.cpp 2003-10-30 14:29:05.000000000 +0000
122@@ -1211,9 +1211,9 @@
123 m_iOverrideLevel = other.m_iOverrideLevel;
124 if(m_tabTypes.getItemCount() > 0)
125 {
126- UT_uint32 dum = reinterpret_cast<UT_uint32>(m_tabTypes.getNthItem(0));
127+ UT_uint32 dum = static_cast<UT_uint32>(reinterpret_cast<size_t>(m_tabTypes.getNthItem(0)));
128 m_curTabType = static_cast<eTabType>(dum);
129- dum = reinterpret_cast<UT_uint32>(m_tabLeader.getNthItem(0));
130+ dum = static_cast<UT_uint32>(reinterpret_cast<size_t>(m_tabLeader.getNthItem(0)));
131 m_curTabLeader = static_cast<eTabLeader>(dum);
132 }
133 else
134@@ -2449,7 +2449,7 @@
135 {
136 if (colNum < m_colourTable.getItemCount())
137 {
138- return reinterpret_cast<UT_uint32>(m_colourTable.getNthItem(colNum));
139+ return static_cast<UT_uint32>(reinterpret_cast<size_t>(m_colourTable.getNthItem(colNum)));
140 }
141 else
142 {
143@@ -2461,7 +2461,7 @@
144 {
145 if (colNum < m_colourTable.getItemCount())
146 {
147- return reinterpret_cast<UT_sint32>(m_colourTable.getNthItem(colNum));
148+ return static_cast<UT_sint32>(reinterpret_cast<size_t>(m_colourTable.getNthItem(colNum)));
149 }
150 else
151 {
152@@ -6277,11 +6277,11 @@
153 if (i > 0)
154 propBuffer += ",";
155
156- UT_sint32 tabTwips = reinterpret_cast<UT_sint32>(m_currentRTFState.m_paraProps.m_tabStops.getNthItem(i));
157+ UT_sint32 tabTwips = static_cast<UT_sint32>(reinterpret_cast<size_t>(m_currentRTFState.m_paraProps.m_tabStops.getNthItem(i)));
158 double tabIn = tabTwips/(20.0*72.);
159- UT_uint32 idum = reinterpret_cast<UT_uint32>(m_currentRTFState.m_paraProps.m_tabTypes.getNthItem(i));
160+ UT_uint32 idum = static_cast<UT_uint32>(reinterpret_cast<size_t>(m_currentRTFState.m_paraProps.m_tabTypes.getNthItem(i)));
161 eTabType tabType = static_cast<eTabType>(idum);
162- idum = reinterpret_cast<UT_uint32>((m_currentRTFState.m_paraProps.m_tabLeader.getNthItem(i)));
163+ idum = static_cast<UT_uint32>(reinterpret_cast<size_t>(m_currentRTFState.m_paraProps.m_tabLeader.getNthItem(i)));
164 eTabLeader tabLeader = static_cast<eTabLeader>(idum);
165 char cType = ' ';
166 switch(tabType)
167@@ -9747,11 +9747,11 @@
168 if (i > 0)
169 strcat(propBuffer, ",");
170
171- UT_sint32 tabTwips = reinterpret_cast<UT_sint32>(pParas->m_tabStops.getNthItem(i));
172+ UT_sint32 tabTwips = static_cast<UT_sint32>(reinterpret_cast<size_t>(pParas->m_tabStops.getNthItem(i)));
173 double tabIn = tabTwips/(20.0*72.);
174- UT_uint32 idum = reinterpret_cast<UT_uint32>(pParas->m_tabTypes.getNthItem(i));
175+ UT_uint32 idum = static_cast<UT_uint32>(reinterpret_cast<size_t>(pParas->m_tabTypes.getNthItem(i)));
176 eTabType tabType = static_cast<eTabType>(idum);
177- idum = (UT_uint32) (pParas->m_tabLeader.getNthItem(i));
178+ idum = (UT_uint32) (size_t) (pParas->m_tabLeader.getNthItem(i));
179 eTabLeader tabLeader = static_cast<eTabLeader>(idum);
180 char cType = ' ';
181 switch(tabType)
Multi-platform word processor
This page took 0.086265 seconds and 4 git commands to generate.