9008c9008
< 		UT_DEBUGMSG(("Doing apply FORMAT_TABLE_TABLE \n"));
---
>         	UT_DEBUGMSG(("Doing apply FORMAT_TABLE_TABLE \n"));
9012,9017c9012,9013
< // First set the table format
< 
< 		bRet = m_pDoc->changeStruxFmt(PTC_AddFmt,posTable,posTable,NULL,properties,PTX_SectionTable);	
< 
< // Now clear these away from the cell's so they'll inherit the table's 
< // properties.
---
>         // First set the table format
> 		fp_CellContainer * cell = getCellAtPos(posStart);
9021a9018,9030
> 
> 		UT_sint32 rowStart = 0;
> 		UT_sint32 rowEnd;
> 		UT_sint32 colStart = 0;
> 		UT_sint32 colEnd;
> 		
> 			colStart = 0;
> 			colEnd = numCols-1;
> 		
> 			rowStart = 0;
> 			rowEnd = numRows-1;
> 					
> 		// Loop through the table cells to adjust their formatting		
9024c9033
< 		for (j = 0; j < numRows; j++)
---
> 		for (j = rowStart; j <= rowEnd; j++)
9026c9035
< 			for (i = 0; i < numCols; i++)
---
> 			for (i = colStart; i <= colEnd; i++)
9032c9041
< 					// Remove these properties from the cell
---
> 					// Do the actual change
9034c9043,9054
< 					bRet = m_pDoc->changeStruxFmt(PTC_RemoveFmt,posStart,posStart,NULL,properties,PTX_SectionCell);
---
> 					bRet = m_pDoc->changeStruxFmt(PTC_AddFmt,posStart,posStart,NULL,properties,PTX_SectionCell);
> 					if(pFG != NULL)
> 					{
> 						pFG->insertAtStrux(m_pDoc,72,posStart,
> 										   PTX_SectionCell,sDataID.c_str());
> 					}
> 					else
> 					{
> 						const gchar * attributes[3] = {
> 							PT_STRUX_IMAGE_DATAID,NULL,NULL};
> 						bRet = m_pDoc->changeStruxFmt(PTC_RemoveFmt, posStart, posStart, attributes, NULL, PTX_SectionCell);	
> 					}