nested table implementation and fix for empty column width

eclipse-birt · Jun 26, 2014 · 1a22872 · 1a22872
1 parent f683673
commit 1a22872
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/...eport.engine.emitter.pptx/src/org/eclipse/birt/report/engine/emitter/pptx/PPTXRender.java b/...eport.engine.emitter.pptx/src/org/eclipse/birt/report/engine/emitter/pptx/PPTXRender.java
@@ -257,7 +257,7 @@ private void outputTable( TableArea table )
 	private void outputText( ContainerArea text )
 	{
 		if ( editMode )
-		{
+		{  
 			int x = currentX + getX( text );
 			int y = currentY + getY( text );
 			int width = getWidth( text );

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
@@ -138,7 +138,7 @@ private void writeColumnsWidth( TableArea tablearea )
 				CellArea ca = ((RowArea) tablearea.getChild( 0 )).getCell( i );
 				if( ca != null )
 				{
-					cellwidth = ca.getWidth( );					
+					cellwidth = ca.getWidth( );
 				}
 			}
 			if( cellwidth > 0 )
@@ -186,7 +186,7 @@ private void endRow( )
 	{
 		writer.closeTag( "a:tr" );
 	}
-
+	
 	protected void drawCell( CellArea cell)
 	{
 
@@ -360,7 +360,7 @@ protected void drawCellBox( CellArea cell )
 
 		if ( bgimginfo != null && bgimginfo.getRepeatedMode( ) == BackgroundImageInfo.REPEAT )
 		{
-			canvas.setBackgroundImg( canvas.getImageRelationship( bgimginfo ), 0, 0 );	
+			canvas.setBackgroundImg( canvas.getImageRelationship( bgimginfo ), 0, 0);	
 		}		
 		else if ( backgroundcolor != null )
 		{
@@ -527,10 +527,12 @@ public int getNumRows()
 		{
 			return rows;
 		}
+
 		public int getNumColumns()
 		{
 			return columns;
 		}
+
 		public void removeARow()
 		{
 			rows--;