Merge branch 'master' into enh-2444-glyphlayoutmanager

Author: hyrahul

UI/org.eclipse.birt.report.designer.ui/src/org/eclipse/birt/report/designer/internal/ui/layout/AbstractPageFlowLayout.java

@@ -184,6 +184,8 @@ protected Result getReportBounds(Rectangle reportSize) {
 		PrecisionDimension dim = new PrecisionDimension(containerSize.width, containerSize.height);
 
 		double scale = getZoomManager().getZoom();
+		int zoom = owner.getViewer().getControl().getShell().getZoom();
+		scale *= zoom / 100f;
 		dim.performScale(1 / scale);
 		if (dim.width > reportSize.width + MINLEFTSPACE + MINRIGHTSPACE) {
 			revValue.reportSize.x = (dim.width - reportSize.width) / 2;