diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-09-25 01:19:56 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-09-25 01:19:56 +0800 |
commit | 1fb45205a0838571e0f29c2ac38d11c68e9a8e4e (patch) | |
tree | 11c8da5069ab88e0a6504e5170e42e59b6db9713 | |
parent | 55b8d73baaae0fee7343c1b90306f970f366eca1 (diff) | |
download | marcuscom-ports-1fb45205a0838571e0f29c2ac38d11c68e9a8e4e.tar marcuscom-ports-1fb45205a0838571e0f29c2ac38d11c68e9a8e4e.tar.gz marcuscom-ports-1fb45205a0838571e0f29c2ac38d11c68e9a8e4e.tar.bz2 marcuscom-ports-1fb45205a0838571e0f29c2ac38d11c68e9a8e4e.tar.lz marcuscom-ports-1fb45205a0838571e0f29c2ac38d11c68e9a8e4e.tar.xz marcuscom-ports-1fb45205a0838571e0f29c2ac38d11c68e9a8e4e.tar.zst marcuscom-ports-1fb45205a0838571e0f29c2ac38d11c68e9a8e4e.zip |
Fix some more build issues on Alpha.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1252 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r-- | editors/AbiWord2/files/patch-src_wp_impexp_xp_ie_Table.cpp | 29 | ||||
-rw-r--r-- | editors/AbiWord2/files/patch-src_wp_impexp_xp_ie_imp_RTF.cpp | 59 |
2 files changed, 88 insertions, 0 deletions
diff --git a/editors/AbiWord2/files/patch-src_wp_impexp_xp_ie_Table.cpp b/editors/AbiWord2/files/patch-src_wp_impexp_xp_ie_Table.cpp new file mode 100644 index 000000000..a3f8a7e79 --- /dev/null +++ b/editors/AbiWord2/files/patch-src_wp_impexp_xp_ie_Table.cpp @@ -0,0 +1,29 @@ +--- src/wp/impexp/xp/ie_Table.cpp.orig Tue Sep 23 21:23:58 2003 ++++ src/wp/impexp/xp/ie_Table.cpp Tue Sep 23 21:31:58 2003 +@@ -1028,7 +1028,7 @@ + UT_sint32 j = 0; + for(j=0; !bMatch && (j < static_cast<UT_sint32>(m_vecCellX.getItemCount())); j++) + { +- UT_sint32 prevX = reinterpret_cast<UT_sint32>(m_vecCellX.getNthItem(j)); ++ UT_sint32 prevX = reinterpret_cast<long>(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<UT_sint32>(m_vecCellX.getItemCount()); i++) + { +- UT_sint32 iCellx = reinterpret_cast<UT_sint32>(m_vecCellX.getNthItem(i)); ++ UT_sint32 iCellx = reinterpret_cast<long>(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<double>(iDiffCellx)/1440.0 -dColSpace; +@@ -1377,7 +1377,7 @@ + UT_sint32 iSub = 0; + for(i=0; !bFound && (i< static_cast<UT_sint32>(m_vecCellX.getItemCount())); i++) + { +- UT_sint32 icellx = reinterpret_cast<UT_sint32>(m_vecCellX.getNthItem(i)); ++ UT_sint32 icellx = reinterpret_cast<long>(m_vecCellX.getNthItem(i)); + if(icellx == -1) + { + iSub++; diff --git a/editors/AbiWord2/files/patch-src_wp_impexp_xp_ie_imp_RTF.cpp b/editors/AbiWord2/files/patch-src_wp_impexp_xp_ie_imp_RTF.cpp new file mode 100644 index 000000000..90ad29c85 --- /dev/null +++ b/editors/AbiWord2/files/patch-src_wp_impexp_xp_ie_imp_RTF.cpp @@ -0,0 +1,59 @@ +--- src/wp/impexp/xp/ie_imp_RTF.cpp.orig Tue Sep 23 21:19:45 2003 ++++ src/wp/impexp/xp/ie_imp_RTF.cpp Tue Sep 23 21:22:22 2003 +@@ -1208,9 +1208,9 @@ + m_iOverrideLevel = other.m_iOverrideLevel; + if(m_tabTypes.getItemCount() > 0) + { +- UT_uint32 dum = reinterpret_cast<UT_uint32>(m_tabTypes.getNthItem(0)); ++ UT_uint32 dum = reinterpret_cast<unsigned long>(m_tabTypes.getNthItem(0)); + m_curTabType = static_cast<eTabType>(dum); +- dum = reinterpret_cast<UT_uint32>(m_tabLeader.getNthItem(0)); ++ dum = reinterpret_cast<unsigned long>(m_tabLeader.getNthItem(0)); + m_curTabLeader = static_cast<eTabLeader>(dum); + } + else +@@ -2442,7 +2442,7 @@ + { + if (colNum < m_colourTable.getItemCount()) + { +- return reinterpret_cast<UT_uint32>(m_colourTable.getNthItem(colNum)); ++ return reinterpret_cast<unsigned long>(m_colourTable.getNthItem(colNum)); + } + else + { +@@ -2454,7 +2454,7 @@ + { + if (colNum < m_colourTable.getItemCount()) + { +- return reinterpret_cast<UT_sint32>(m_colourTable.getNthItem(colNum)); ++ return reinterpret_cast<long>(m_colourTable.getNthItem(colNum)); + } + else + { +@@ -6185,11 +6185,11 @@ + if (i > 0) + propBuffer += ","; + +- UT_sint32 tabTwips = reinterpret_cast<UT_sint32>(m_currentRTFState.m_paraProps.m_tabStops.getNthItem(i)); ++ UT_sint32 tabTwips = reinterpret_cast<long>(m_currentRTFState.m_paraProps.m_tabStops.getNthItem(i)); + double tabIn = tabTwips/(20.0*72.); +- UT_uint32 idum = reinterpret_cast<UT_uint32>(m_currentRTFState.m_paraProps.m_tabTypes.getNthItem(i)); ++ UT_uint32 idum = reinterpret_cast<unsigned long>(m_currentRTFState.m_paraProps.m_tabTypes.getNthItem(i)); + eTabType tabType = static_cast<eTabType>(idum); +- idum = reinterpret_cast<UT_uint32>((m_currentRTFState.m_paraProps.m_tabLeader.getNthItem(i))); ++ idum = reinterpret_cast<unsigned long>((m_currentRTFState.m_paraProps.m_tabLeader.getNthItem(i))); + eTabLeader tabLeader = static_cast<eTabLeader>(idum); + char cType = ' '; + switch(tabType) +@@ -9654,9 +9654,9 @@ + if (i > 0) + strcat(propBuffer, ","); + +- UT_sint32 tabTwips = reinterpret_cast<UT_sint32>(pParas->m_tabStops.getNthItem(i)); ++ UT_sint32 tabTwips = reinterpret_cast<long>(pParas->m_tabStops.getNthItem(i)); + double tabIn = tabTwips/(20.0*72.); +- UT_uint32 idum = reinterpret_cast<UT_uint32>(pParas->m_tabTypes.getNthItem(i)); ++ UT_uint32 idum = reinterpret_cast<unsigned long>(pParas->m_tabTypes.getNthItem(i)); + eTabType tabType = static_cast<eTabType>(idum); + idum = (UT_uint32) (pParas->m_tabLeader.getNthItem(i)); + eTabLeader tabLeader = static_cast<eTabLeader>(idum); |