Updated x and y coordinate on table for overflow items

eclipse-birt · Jul 3, 2014 · 65b72fe · 65b72fe
1 parent 5a700f7
commit 65b72fe
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/...port.engine.emitter.pptx/src/org/eclipse/birt/report/engine/emitter/pptx/TableWriter.java b/...port.engine.emitter.pptx/src/org/eclipse/birt/report/engine/emitter/pptx/TableWriter.java
@@ -72,6 +72,7 @@ protected void drawTable( TableArea table )
 
 		currentX += getX( table );
 		currentY += getY( table );
+		updateRenderXY( );	
 		parseTableExtraSpanRows( table );
 
 		startTable( table );
@@ -82,13 +83,14 @@ protected void drawTable( TableArea table )
 		{
 			// end clip...
 		}
-		updateRenderXY( );
+
 		if ( table.needClip( ) )
 		{
 			graphics.endClip( );
 		}
 		currentX -= getX( table );
 		currentY -= getY( table );
+		updateRenderXY( );		
 		endTable( );
 	}
 
@@ -107,7 +109,13 @@ private void iterateOnRows( IContainerArea table )
 			}
 			else
 			{// TableGroupArea:
+				currentX += getX( table );
+				currentY += getY( table );
+				updateRenderXY( );				
 				iterateOnRows( (TableGroupArea) child );
+				currentX -= getX( table );
+				currentY -= getY( table );
+				updateRenderXY( );					
 				currentRow = internalRowCount + 1;
 			}
 		}
@@ -275,22 +283,24 @@ protected void drawCell( CellArea cell )
 
 		currentX += getX( cell );
 		currentY += getY( cell );
+		updateRenderXY( );
 		startCell( cell );
-		if( cell.getChildrenCount( ) == 0 )
-		{//draw emtpy textbox for size of cell to remain, use font size 8
-			if( emptytextboxwriter == null )
+		if ( cell.getChildrenCount( ) == 0 )
+		{// draw emtpy textbox for size of cell to remain, use font size 8
+			if ( emptytextboxwriter == null )
 			{
-				emptytextboxwriter = new TextWriter(render);
+				emptytextboxwriter = new TextWriter( render );
 			}
 			emptytextboxwriter.writeBlankTextBlock( 800 );
 		}
 		else
 		{
-		visitChildren( cell );
+			visitChildren( cell );
 		}
 		endCell( cell );
 		currentX -= getX( cell );
 		currentY -= getY( cell );
+		updateRenderXY( );
 	}
 
 	/**
@@ -411,7 +421,6 @@ else if ( rectMerge )
 
 	protected void visitChildren( IContainerArea container )
 	{
-		updateRenderXY( );
 		Iterator<IArea> iter = container.getChildren( );
 		boolean notFirstTextBox = false;
 		while ( iter.hasNext( ) )
@@ -435,7 +444,6 @@ protected void visitChildren( IContainerArea container )
 			}
 
 		}
-		updateRenderXY( );
 	}
 
 	/**