From 3491712f3dc986e5177a61c34853f50614d29217 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 21 May 2004 19:03:56 +0000 Subject: [PATCH] - outdated Changed files: abiword-types.patch -> 1.2 --- abiword-types.patch | 181 -------------------------------------------- 1 file changed, 181 deletions(-) delete mode 100644 abiword-types.patch diff --git a/abiword-types.patch b/abiword-types.patch deleted file mode 100644 index 4d32734..0000000 --- a/abiword-types.patch +++ /dev/null @@ -1,181 +0,0 @@ ---- abiword-2.0.1/abi/src/af/xap/xp/xap_Draw_Symbol.cpp.orig 2003-05-07 17:40:40.000000000 +0000 -+++ abiword-2.0.1/abi/src/af/xap/xp/xap_Draw_Symbol.cpp 2003-10-30 13:19:59.000000000 +0000 -@@ -153,7 +153,7 @@ - - for (i = 0; i < m_vCharSet.size(); i += 2) - { -- UT_UCSChar base = static_cast(reinterpret_cast(m_vCharSet[i])); -+ UT_UCSChar base = static_cast(reinterpret_cast(m_vCharSet[i])); - size_t nb_chars = reinterpret_cast(m_vCharSet[i + 1]); - - for (UT_UCSChar j = base; j < base + nb_chars; ++j) -@@ -194,11 +194,11 @@ - UT_DEBUGMSG(("calcSymbolFromCoords(x = [%u], y = [%u]) =", ix, iy)); - for (size_t i = 0; i < m_vCharSet.size(); i += 2) - { -- count += reinterpret_cast(m_vCharSet[i + 1]); -+ count += reinterpret_cast(m_vCharSet[i + 1]); - if (count > index) - { -- UT_DEBUGMSG((" %u\n", static_cast(reinterpret_cast(m_vCharSet[i]) + index - count + reinterpret_cast(m_vCharSet[i + 1])))); -- return static_cast(reinterpret_cast(m_vCharSet[i]) + index - count + reinterpret_cast(m_vCharSet[i + 1])); -+ UT_DEBUGMSG((" %u\n", static_cast(reinterpret_cast(m_vCharSet[i]) + index - count + reinterpret_cast(m_vCharSet[i + 1])))); -+ return static_cast(reinterpret_cast(m_vCharSet[i]) + index - count + reinterpret_cast(m_vCharSet[i + 1])); - } - } - -@@ -227,8 +227,8 @@ - - for (size_t i = 0; i < m_vCharSet.size(); i += 2) - { -- UT_uint32 base = reinterpret_cast(m_vCharSet[i]); -- UT_uint32 size = reinterpret_cast(m_vCharSet[i + 1]); -+ UT_uint32 base = reinterpret_cast(m_vCharSet[i]); -+ UT_uint32 size = reinterpret_cast(m_vCharSet[i + 1]); - - if (base + size > c) - { ---- abiword-2.0.1/abi/src/af/xap/unix/xap_UnixFont.cpp.orig 2003-08-22 20:52:07.000000000 +0000 -+++ abiword-2.0.1/abi/src/af/xap/unix/xap_UnixFont.cpp 2003-10-30 13:31:22.000000000 +0000 -@@ -400,10 +400,10 @@ - size_t idx = 0; - for (size_t i = 0; i < coverage.size(); i += 2) - { -- UT_UCSChar c1 = static_cast(reinterpret_cast(coverage[i])); -+ UT_UCSChar c1 = static_cast(reinterpret_cast(coverage[i])); - UT_UCSChar c2 = - static_cast(static_cast(c1)) + -- static_cast(reinterpret_cast(coverage[i + 1])); -+ static_cast(reinterpret_cast(coverage[i + 1])); - for (UT_UCSChar c = c1; c < c2; ++c) - { - FT_UInt glyph_idx = FT_Get_Char_Index(face, c); ---- abiword-2.0.1/abi/src/wp/impexp/xp/ie_exp_HTML.cpp.orig 2003-09-23 09:34:59.000000000 +0000 -+++ abiword-2.0.1/abi/src/wp/impexp/xp/ie_exp_HTML.cpp 2003-10-30 13:58:22.000000000 +0000 -@@ -777,7 +777,7 @@ - void * vptr = 0; - m_tagStack.pop (&vptr); - -- if (reinterpret_cast(vptr) == tagID) return; -+ if (static_cast(reinterpret_cast(vptr)) == tagID) return; - - UT_DEBUGMSG(("WARNING: possible tag mis-match in XHTML output!\n")); - } -@@ -821,7 +821,7 @@ - UT_uint32 s_HTML_Listener::tagTop () - { - void * vptr = 0; -- if (m_tagStack.viewTop (&vptr)) return reinterpret_cast(vptr); -+ if (m_tagStack.viewTop (&vptr)) return static_cast(reinterpret_cast(vptr)); - return 0; - } - -@@ -1898,7 +1898,7 @@ - { - void * vptr = 0; - m_utsListType.viewTop (&vptr); -- return static_cast(reinterpret_cast(vptr)); -+ return static_cast(reinterpret_cast(vptr)); - } - - void s_HTML_Listener::listPush (UT_uint16 type, const char * ClassName) -@@ -1937,7 +1937,7 @@ - - void * vptr = 0; - m_utsListType.pop (&vptr); -- UT_uint16 type = static_cast(reinterpret_cast(vptr)); -+ UT_uint16 type = static_cast(reinterpret_cast(vptr)); - - UT_uint32 tagID; - ---- abiword-2.0.1/abi/src/wp/impexp/xp/ie_Table.cpp.orig 2003-08-25 01:45:11.000000000 +0000 -+++ abiword-2.0.1/abi/src/wp/impexp/xp/ie_Table.cpp 2003-10-30 14:31:50.000000000 +0000 -@@ -1028,7 +1028,7 @@ - UT_sint32 j = 0; - for(j=0; !bMatch && (j < static_cast(m_vecCellX.getItemCount())); j++) - { -- UT_sint32 prevX = reinterpret_cast(m_vecCellX.getNthItem(j)); -+ UT_sint32 prevX = static_cast(reinterpret_cast(m_vecCellX.getNthItem(j))); - UT_DEBUGMSG(("Prev cell %d cellx %d \n",j,prevX)); - bool bLast = ((j-1) == szCurRow); - bMatch = doCellXMatch(prevX,curX,bLast); -@@ -1179,7 +1179,7 @@ - sColWidth.clear(); - for(i=0; i< static_cast(m_vecCellX.getItemCount()); i++) - { -- UT_sint32 iCellx = reinterpret_cast(m_vecCellX.getNthItem(i)); -+ UT_sint32 iCellx = static_cast(reinterpret_cast(m_vecCellX.getNthItem(i))); - xxx_UT_DEBUGMSG(("final cellx import cellx %d iPrev %x \n",iCellx,iPrev)); - UT_sint32 iDiffCellx = iCellx - iPrev; - double dCellx = static_cast(iDiffCellx)/1440.0 -dColSpace; -@@ -1377,7 +1377,7 @@ - UT_sint32 iSub = 0; - for(i=0; !bFound && (i< static_cast(m_vecCellX.getItemCount())); i++) - { -- UT_sint32 icellx = reinterpret_cast(m_vecCellX.getNthItem(i)); -+ UT_sint32 icellx = static_cast(reinterpret_cast(m_vecCellX.getNthItem(i))); - if(icellx == -1) - { - iSub++; ---- abiword-2.0.1/abi/src/wp/impexp/xp/ie_imp_RTF.cpp.orig 2003-09-19 08:03:26.000000000 +0000 -+++ abiword-2.0.1/abi/src/wp/impexp/xp/ie_imp_RTF.cpp 2003-10-30 14:29:05.000000000 +0000 -@@ -1211,9 +1211,9 @@ - m_iOverrideLevel = other.m_iOverrideLevel; - if(m_tabTypes.getItemCount() > 0) - { -- UT_uint32 dum = reinterpret_cast(m_tabTypes.getNthItem(0)); -+ UT_uint32 dum = static_cast(reinterpret_cast(m_tabTypes.getNthItem(0))); - m_curTabType = static_cast(dum); -- dum = reinterpret_cast(m_tabLeader.getNthItem(0)); -+ dum = static_cast(reinterpret_cast(m_tabLeader.getNthItem(0))); - m_curTabLeader = static_cast(dum); - } - else -@@ -2449,7 +2449,7 @@ - { - if (colNum < m_colourTable.getItemCount()) - { -- return reinterpret_cast(m_colourTable.getNthItem(colNum)); -+ return static_cast(reinterpret_cast(m_colourTable.getNthItem(colNum))); - } - else - { -@@ -2461,7 +2461,7 @@ - { - if (colNum < m_colourTable.getItemCount()) - { -- return reinterpret_cast(m_colourTable.getNthItem(colNum)); -+ return static_cast(reinterpret_cast(m_colourTable.getNthItem(colNum))); - } - else - { -@@ -6277,11 +6277,11 @@ - if (i > 0) - propBuffer += ","; - -- UT_sint32 tabTwips = reinterpret_cast(m_currentRTFState.m_paraProps.m_tabStops.getNthItem(i)); -+ UT_sint32 tabTwips = static_cast(reinterpret_cast(m_currentRTFState.m_paraProps.m_tabStops.getNthItem(i))); - double tabIn = tabTwips/(20.0*72.); -- UT_uint32 idum = reinterpret_cast(m_currentRTFState.m_paraProps.m_tabTypes.getNthItem(i)); -+ UT_uint32 idum = static_cast(reinterpret_cast(m_currentRTFState.m_paraProps.m_tabTypes.getNthItem(i))); - eTabType tabType = static_cast(idum); -- idum = reinterpret_cast((m_currentRTFState.m_paraProps.m_tabLeader.getNthItem(i))); -+ idum = static_cast(reinterpret_cast(m_currentRTFState.m_paraProps.m_tabLeader.getNthItem(i))); - eTabLeader tabLeader = static_cast(idum); - char cType = ' '; - switch(tabType) -@@ -9747,11 +9747,11 @@ - if (i > 0) - strcat(propBuffer, ","); - -- UT_sint32 tabTwips = reinterpret_cast(pParas->m_tabStops.getNthItem(i)); -+ UT_sint32 tabTwips = static_cast(reinterpret_cast(pParas->m_tabStops.getNthItem(i))); - double tabIn = tabTwips/(20.0*72.); -- UT_uint32 idum = reinterpret_cast(pParas->m_tabTypes.getNthItem(i)); -+ UT_uint32 idum = static_cast(reinterpret_cast(pParas->m_tabTypes.getNthItem(i))); - eTabType tabType = static_cast(idum); -- idum = (UT_uint32) (pParas->m_tabLeader.getNthItem(i)); -+ idum = (UT_uint32) (size_t) (pParas->m_tabLeader.getNthItem(i)); - eTabLeader tabLeader = static_cast(idum); - char cType = ' '; - switch(tabType) -- 2.44.0