Merge pull request #302 from sguan-actuate/master

fix certain report design that does not convert properly in PPTX
eclipse-birt · May 13, 2016 · 2dd964b · 2dd964b
2 parents 53617c4 + 609fbd2
commit 2dd964b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/...ine.emitter.pptx/src/org/eclipse/birt/report/engine/emitter/pptx/writer/Presentation.java b/...ine.emitter.pptx/src/org/eclipse/birt/report/engine/emitter/pptx/writer/Presentation.java
@@ -52,6 +52,8 @@ public class Presentation extends Component
 
 	private static final String TAG_SLIDE_MASTER_ID_LIST = "p:sldMasterIdLst";
 
+	public static final int MAX_SLIDE_HEIGHT = 51206400;
+
 	private final PPTXBookmarkManager bmkmanager;
 
 	private int slideMasterId = 1;
@@ -181,12 +183,16 @@ public void close( ) throws IOException
 		writer.openTag( TAG_SLIDE_SZ );
 		// Set default page size to A4.
 		if ( width == 0 )
-		{
 			width = 612;
+		if ( height == 0 )
 			height = 792;
-		}
+
+
 		long convertedWidth = OOXmlUtil.convertPointerToEmus( width );
 		long convertedHeight = OOXmlUtil.convertPointerToEmus( height );
+
+		if ( convertedHeight > MAX_SLIDE_HEIGHT )
+			convertedHeight = MAX_SLIDE_HEIGHT;
 		writer.attribute( TAG_CX, convertedWidth );
 		writer.attribute( TAG_CY, convertedHeight );
 		writer.closeTag( TAG_SLIDE_SZ );

diff --git a/...g.eclipse.birt.report.model/src/org/eclipse/birt/report/model/api/util/DimensionUtil.java b/...g.eclipse.birt.report.model/src/org/eclipse/birt/report/model/api/util/DimensionUtil.java
@@ -144,6 +144,9 @@ else if ( DesignChoiceConstants.UNITS_MM
 			else if ( DesignChoiceConstants.UNITS_PC
 					.equalsIgnoreCase( fromUnits ) )
 				targetMeasure = measure * POINTS_PER_PICA;
+			else if ( DesignChoiceConstants.UNITS_PX
+					.equalsIgnoreCase( fromUnits ) )
+				targetMeasure = measure * POINTS_PER_INCH / DEFAULT_DPI;
 			else
 				throw new IllegalArgumentException(
 						"\"fromUnits\"" + ILLEGAL_UNIT ); //$NON-NLS-1$