Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 43260 | Differences between
and this patch

Collapse All | Expand All

(-)/var/tmp/portage/abiword-2.0.3-r1/work/abiword-2.0.3/abi/src/wp/impexp/xp/ie_imp_RTF.cpp (-9 / +9 lines)
Lines 1211-1219 Link Here
1211
		m_iOverrideLevel = other.m_iOverrideLevel;
1211
		m_iOverrideLevel = other.m_iOverrideLevel;
1212
		if(m_tabTypes.getItemCount() > 0)
1212
		if(m_tabTypes.getItemCount() > 0)
1213
		{
1213
		{
1214
			UT_uint32 dum = reinterpret_cast<UT_uint32>(m_tabTypes.getNthItem(0));
1214
			UT_uint32 dum = reinterpret_cast<unsigned long>(m_tabTypes.getNthItem(0));
1215
			m_curTabType = static_cast<eTabType>(dum);
1215
			m_curTabType = static_cast<eTabType>(dum);
1216
			dum = reinterpret_cast<UT_uint32>(m_tabLeader.getNthItem(0));
1216
			dum = reinterpret_cast<unsigned long>(m_tabLeader.getNthItem(0));
1217
			m_curTabLeader = static_cast<eTabLeader>(dum);
1217
			m_curTabLeader = static_cast<eTabLeader>(dum);
1218
		}
1218
		}
1219
		else
1219
		else
Lines 2458-2464 Link Here
2458
{
2458
{
2459
	if (colNum < m_colourTable.getItemCount())
2459
	if (colNum < m_colourTable.getItemCount())
2460
	{
2460
	{
2461
		return reinterpret_cast<UT_uint32>(m_colourTable.getNthItem(colNum));
2461
		return reinterpret_cast<unsigned long>(m_colourTable.getNthItem(colNum));
2462
	}
2462
	}
2463
	else
2463
	else
2464
	{
2464
	{
Lines 2470-2476 Link Here
2470
{
2470
{
2471
	if (colNum < m_colourTable.getItemCount())
2471
	if (colNum < m_colourTable.getItemCount())
2472
	{
2472
	{
2473
		return reinterpret_cast<UT_sint32>(m_colourTable.getNthItem(colNum));
2473
		return reinterpret_cast<signed long>(m_colourTable.getNthItem(colNum));
2474
	}
2474
	}
2475
	else
2475
	else
2476
	{
2476
	{
Lines 6327-6337 Link Here
6327
			if (i > 0)
6327
			if (i > 0)
6328
				propBuffer += ",";
6328
				propBuffer += ",";
6329
6329
6330
			UT_sint32 tabTwips = reinterpret_cast<UT_sint32>(m_currentRTFState.m_paraProps.m_tabStops.getNthItem(i));
6330
			UT_sint32 tabTwips = reinterpret_cast<signed long>(m_currentRTFState.m_paraProps.m_tabStops.getNthItem(i));
6331
			double tabIn = tabTwips/(20.0*72.);
6331
			double tabIn = tabTwips/(20.0*72.);
6332
			UT_uint32 idum = reinterpret_cast<UT_uint32>(m_currentRTFState.m_paraProps.m_tabTypes.getNthItem(i));
6332
			UT_uint32 idum = reinterpret_cast<unsigned long>(m_currentRTFState.m_paraProps.m_tabTypes.getNthItem(i));
6333
			eTabType tabType = static_cast<eTabType>(idum);
6333
			eTabType tabType = static_cast<eTabType>(idum);
6334
			idum = reinterpret_cast<UT_uint32>((m_currentRTFState.m_paraProps.m_tabLeader.getNthItem(i)));
6334
			idum = reinterpret_cast<unsigned long>((m_currentRTFState.m_paraProps.m_tabLeader.getNthItem(i)));
6335
			eTabLeader tabLeader = static_cast<eTabLeader>(idum);
6335
			eTabLeader tabLeader = static_cast<eTabLeader>(idum);
6336
			char  cType = ' ';
6336
			char  cType = ' ';
6337
			switch(tabType)
6337
			switch(tabType)
Lines 9808-9816 Link Here
9808
		if (i > 0)
9808
		if (i > 0)
9809
			strcat(propBuffer, ",");
9809
			strcat(propBuffer, ",");
9810
9810
9811
		UT_sint32 tabTwips = reinterpret_cast<UT_sint32>(pParas->m_tabStops.getNthItem(i));
9811
		UT_sint32 tabTwips = reinterpret_cast<signed long>(pParas->m_tabStops.getNthItem(i));
9812
		double tabIn = tabTwips/(20.0*72.);
9812
		double tabIn = tabTwips/(20.0*72.);
9813
		UT_uint32 idum = reinterpret_cast<UT_uint32>(pParas->m_tabTypes.getNthItem(i));
9813
		UT_uint32 idum = reinterpret_cast<unsigned long>(pParas->m_tabTypes.getNthItem(i));
9814
		eTabType tabType = static_cast<eTabType>(idum);
9814
		eTabType tabType = static_cast<eTabType>(idum);
9815
		idum = (UT_uint32) (pParas->m_tabLeader.getNthItem(i));
9815
		idum = (UT_uint32) (pParas->m_tabLeader.getNthItem(i));
9816
		eTabLeader tabLeader = static_cast<eTabLeader>(idum);
9816
		eTabLeader tabLeader = static_cast<eTabLeader>(idum);

Return to bug 43260