Index: sw/source/filter/xml/xmltble.cxx
===================================================================
--- sw/source/filter/xml/xmltble.cxx	(revision 275355)
+++ sw/source/filter/xml/xmltble.cxx	(working copy)
@@ -88,7 +88,7 @@
 public:
 
 
-	SwXMLTableColumn_Impl( sal_uInt16 nPosition ) :
+	SwXMLTableColumn_Impl( sal_uInt32 nPosition ) :
 		SwWriteTableCol( nPosition ),
 		nRelWidth( 0UL )
 	{};
@@ -143,7 +143,7 @@
 	nWidth( 0UL )
 {
 #ifndef PRODUCT
-	sal_uInt16 nEndCPos = 0U;
+	sal_uInt32 nEndCPos = 0U;
 #endif
 	sal_uInt16 nLines = rLines.Count();
 	sal_uInt16 nLine;
@@ -153,14 +153,14 @@
 		const SwTableBoxes& rBoxes = pLine->GetTabBoxes();
 		sal_uInt16 nBoxes = rBoxes.Count();
 
-		sal_uInt16 nCPos = 0U;
+		sal_uInt32 nCPos = 0U;
 		for( sal_uInt16 nBox=0U; nBox<nBoxes; nBox++ )
 		{
 			const SwTableBox *pBox = rBoxes[nBox];
 
 			if( nBox < nBoxes-1U || nWidth==0UL )
 			{
-                nCPos = nCPos + (sal_uInt16)SwWriteTable::GetBoxWidth( pBox );
+                nCPos = nCPos + SwWriteTable::GetBoxWidth( pBox );
 				SwXMLTableColumn_Impl *pCol =
 					new SwXMLTableColumn_Impl( nCPos );
 
@@ -177,8 +177,8 @@
 			else
 			{
 #ifndef PRODUCT
-				sal_uInt16 nCheckPos =
-					nCPos + (sal_uInt16)SwWriteTable::GetBoxWidth( pBox );
+				sal_uInt32 nCheckPos =
+					nCPos + SwWriteTable::GetBoxWidth( pBox );
 				if( !nEndCPos )
 				{
 					nEndCPos = nCheckPos;
@@ -192,9 +192,9 @@
 					*/
 				}
 #endif
-				nCPos = (sal_uInt16)nWidth;
+				nCPos = nWidth;
 #ifndef PRODUCT
-				SwXMLTableColumn_Impl aCol( (sal_uInt16)nWidth );
+				SwXMLTableColumn_Impl aCol( nWidth );
 				ASSERT( aCols.Seek_Entry(&aCol), "couldn't find last column" );
 				ASSERT( SwXMLTableColumn_Impl(nCheckPos) ==
 											SwXMLTableColumn_Impl(nCPos),
@@ -608,13 +608,13 @@
 	// pass 2: export column styles
 	{
 		const SwXMLTableColumns_Impl& rCols = pLines->GetColumns();
-		sal_uInt16 nCPos = 0U;
+		sal_uInt32 nCPos = 0U;
 		sal_uInt16 nColumns = rCols.Count();
 		for( sal_uInt16	nColumn=0U; nColumn<nColumns; nColumn++ )
 		{
 			SwXMLTableColumn_Impl *pColumn = rCols[nColumn];
 
-			sal_uInt16 nOldCPos = nCPos;
+			sal_uInt32 nOldCPos = nCPos;
 			nCPos = pColumn->GetPos();
 
 			sal_uInt32 nWidth = nCPos - nOldCPos;
@@ -640,7 +640,7 @@
 					nColAbsWidth += (nBaseWidth/2UL);
 					nColAbsWidth /= nBaseWidth;
 				}
-				pColumn->SetWidthOpt( (sal_uInt16)nColAbsWidth, sal_False );
+				pColumn->SetWidthOpt( nColAbsWidth, sal_False );
 			}
 
 			ULONG nExpPos = 0;
@@ -684,16 +684,16 @@
 		const SwTableBoxes& rBoxes = pLine->GetTabBoxes();
 		sal_uInt16 nBoxes = rBoxes.Count();
 
-		sal_uInt16 nCPos = 0U;
+		sal_uInt32 nCPos = 0U;
 		sal_uInt16 nCol = 0U;
 		for( sal_uInt16 nBox=0U; nBox<nBoxes; nBox++ )
 		{
 			SwTableBox *pBox = rBoxes[nBox];
 
 			if( nBox < nBoxes-1U )
-                nCPos = nCPos + (sal_uInt16)SwWriteTable::GetBoxWidth( pBox );
+                nCPos = nCPos + SwWriteTable::GetBoxWidth( pBox );
 			else
-				nCPos = (sal_uInt16)pLines->GetWidth();
+				nCPos = pLines->GetWidth();
 
 
 			// Und ihren Index
@@ -965,7 +965,7 @@
 		const SwTableBoxes& rBoxes = rLine.GetTabBoxes();
 		sal_uInt16 nBoxes = rBoxes.Count();
 
-		sal_uInt16 nCPos = 0U;
+		sal_uInt32 nCPos = 0U;
 		sal_uInt16 nCol = 0U;
 		for( sal_uInt16 nBox=0U; nBox<nBoxes; nBox++ )
 		{
@@ -981,9 +981,9 @@
 	        }
 
 			if( nBox < nBoxes-1U )
-                nCPos = nCPos + (sal_uInt16)SwWriteTable::GetBoxWidth( pBox );
+                nCPos = nCPos + SwWriteTable::GetBoxWidth( pBox );
 			else
-				nCPos = (sal_uInt16)rLines.GetWidth();
+				nCPos = rLines.GetWidth();
 
 			// Und ihren Index
             const sal_uInt16 nOldCol = nCol;
Index: sw/source/filter/inc/wrtswtbl.hxx
===================================================================
--- sw/source/filter/inc/wrtswtbl.hxx	(revision 275355)
+++ sw/source/filter/inc/wrtswtbl.hxx	(working copy)
@@ -181,7 +181,7 @@
 
 class SwWriteTableCol
 {
-	USHORT nPos;						// End Position der Spalte
+	sal_uInt32 nPos;						// End Position der Spalte
 
 	USHORT nWidthOpt;
 
@@ -192,9 +192,9 @@
 	BOOL bLeftBorder : 1;				// Welche Umrandungen sind da?
 	BOOL bRightBorder : 1;
 
-	SwWriteTableCol( USHORT nPosition );
+	SwWriteTableCol( sal_uInt32 nPosition );
 
-	USHORT GetPos() const 						{ return nPos; }
+	sal_uInt32 GetPos() const 						{ return nPos; }
 
 	void SetLeftBorder( BOOL bBorder ) 			{ bLeftBorder = bBorder; }
 	BOOL HasLeftBorder() const 					{ return bLeftBorder; }
@@ -208,7 +208,7 @@
 	inline int operator==( const SwWriteTableCol& rCol ) const;
 	inline int operator<( const SwWriteTableCol& rCol ) const;
 
-	void SetWidthOpt( USHORT nWidth, BOOL bRel )
+	void SetWidthOpt( sal_uInt32 nWidth, BOOL bRel )
 	{
 		nWidthOpt = nWidth; bRelWidthOpt = bRel;
 	}
@@ -272,16 +272,16 @@
 	virtual BOOL ShouldExpandSub( const SwTableBox *pBox,
 								BOOL bExpandedBefore, USHORT nDepth ) const;
 
-	void CollectTableRowsCols( long nStartRPos, USHORT nStartCPos,
+	void CollectTableRowsCols( long nStartRPos, sal_uInt32 nStartCPos,
 							   long nParentLineHeight,
-							   USHORT nParentLineWidth,
+							   sal_uInt32 nParentLineWidth,
 							   const SwTableLines& rLines,
 							   USHORT nDepth );
 
 	void FillTableRowsCols( long nStartRPos, USHORT nStartRow,
-							USHORT nStartCPos, USHORT nStartCol,
+							sal_uInt32 nStartCPos, USHORT nStartCol,
 							long nParentLineHeight,
-							USHORT nParentLineWidth,
+							sal_uInt32 nParentLineWidth,
 							const SwTableLines& rLines,
 							const SvxBrushItem* pLineBrush,
 							USHORT nDepth,
@@ -298,7 +298,7 @@
 	BOOL HasRelWidths() const { return bRelWidths; }
 
 public:
-	static long GetBoxWidth( const SwTableBox *pBox );
+	static sal_uInt32 GetBoxWidth( const SwTableBox *pBox );
 protected:
 
 	long GetLineHeight( const SwTableLine *pLine );
Index: sw/source/filter/writer/wrtswtbl.cxx
===================================================================
--- sw/source/filter/writer/wrtswtbl.cxx	(revision 275355)
+++ sw/source/filter/writer/wrtswtbl.cxx	(working copy)
@@ -95,7 +95,7 @@
 
 //-----------------------------------------------------------------------
 
-SwWriteTableCol::SwWriteTableCol(USHORT nPosition)
+SwWriteTableCol::SwWriteTableCol(sal_uInt32 nPosition)
 	: nPos(nPosition), nWidthOpt(0), bRelWidthOpt(false), bOutWidth(true),
 	bLeftBorder(true), bRightBorder(true)
 {
@@ -103,13 +103,13 @@
 
 //-----------------------------------------------------------------------
 
-long SwWriteTable::GetBoxWidth( const SwTableBox *pBox )
+sal_uInt32 SwWriteTable::GetBoxWidth( const SwTableBox *pBox )
 {
 	const SwFrmFmt *pFmt = pBox->GetFrmFmt();
 	const SwFmtFrmSize& aFrmSize=
         (const SwFmtFrmSize&)pFmt->GetFmtAttr( RES_FRM_SIZE );
 
-	return aFrmSize.GetSize().Width();
+	return sal::static_int_cast<sal_uInt32>(aFrmSize.GetSize().Width());
 }
 
 long SwWriteTable::GetLineHeight( const SwTableLine *pLine )
@@ -422,9 +422,9 @@
 }
 
 void SwWriteTable::CollectTableRowsCols( long nStartRPos,
-										   USHORT nStartCPos,
+										   sal_uInt32 nStartCPos,
 										   long nParentLineHeight,
-										   USHORT nParentLineWidth,
+										   sal_uInt32 nParentLineWidth,
 										   const SwTableLines& rLines,
 										   USHORT nDepth )
 {
@@ -432,7 +432,7 @@
 	USHORT nLines = rLines.Count();
 
 #ifndef PRODUCT
-	USHORT nEndCPos = 0;
+	sal_uInt32 nEndCPos = 0;
 #endif
 
 	long nRPos = nStartRPos;
@@ -487,16 +487,16 @@
 		const SwTableBoxes& rBoxes = pLine->GetTabBoxes();
 		USHORT nBoxes = rBoxes.Count();
 
-		USHORT nCPos = nStartCPos;
+		sal_uInt32 nCPos = nStartCPos;
 		for( USHORT nBox=0; nBox<nBoxes; nBox++ )
 		{
 			const SwTableBox *pBox = rBoxes[nBox];
 
-			USHORT nOldCPos = nCPos;
+			sal_uInt32 nOldCPos = nCPos;
 
 			if( nBox < nBoxes-1 || (nParentLineWidth==0 && nLine==0)  )
 			{
-                nCPos = nCPos + (USHORT)GetBoxWidth( pBox );
+                nCPos = nCPos + GetBoxWidth( pBox );
 				SwWriteTableCol *pCol = new SwWriteTableCol( nCPos );
 
 				USHORT nCol;
@@ -515,7 +515,7 @@
 			else
 			{
 #ifndef PRODUCT
-				USHORT nCheckPos = nCPos + (USHORT)GetBoxWidth( pBox );
+				sal_uInt32 nCheckPos = nCPos + GetBoxWidth( pBox );
 				if( !nEndCPos )
 				{
 					nEndCPos = nCheckPos;
@@ -553,9 +553,9 @@
 
 
 void SwWriteTable::FillTableRowsCols( long nStartRPos, USHORT nStartRow,
-										USHORT nStartCPos, USHORT nStartCol,
+										sal_uInt32 nStartCPos, USHORT nStartCol,
 										long nParentLineHeight,
-										USHORT nParentLineWidth,
+										sal_uInt32 nParentLineWidth,
 										const SwTableLines& rLines,
 										const SvxBrushItem* pParentBrush,
 										USHORT nDepth,
@@ -658,7 +658,7 @@
 		}
 
 		USHORT nBoxes = rBoxes.Count();
-		USHORT nCPos = nStartCPos;
+		sal_uInt32 nCPos = nStartCPos;
 		USHORT nCol = nStartCol;
 
 		for( USHORT nBox=0; nBox<nBoxes; nBox++ )
@@ -666,10 +666,10 @@
 			const SwTableBox *pBox = rBoxes[nBox];
 
 			// Position der letzten ueberdeckten Spalte ermitteln
-			USHORT nOldCPos = nCPos;
+			sal_uInt32 nOldCPos = nCPos;
 			if( nBox < nBoxes-1 || (nParentLineWidth==0 && nLine==0) )
 			{
-                nCPos = nCPos + (USHORT)GetBoxWidth( pBox );
+                nCPos = nCPos + GetBoxWidth( pBox );
 				if( nBox==nBoxes-1 )
 					nParentLineWidth = nCPos - nStartCPos;
 			}