Merge pull request #370 from sguan-actuate/master

Span tag was running properly on 4.2, it required BIDI flag to be true
eclipse-birt · Feb 9, 2017 · 71dc2f7 · 71dc2f7
2 parents ac42bb9 + e261dca
commit 71dc2f7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/...ig.pptx/src/org/eclipse/birt/report/engine/emitter/config/pptx/PPTXEmitterDescriptor.java b/...ig.pptx/src/org/eclipse/birt/report/engine/emitter/config/pptx/PPTXEmitterDescriptor.java
@@ -49,11 +49,10 @@ protected void initOptions( )
 		bidiProcessing.setDataType( IConfigurableOption.DataType.BOOLEAN );
 		bidiProcessing
 				.setDisplayType( IConfigurableOption.DisplayType.CHECKBOX );
-		bidiProcessing.setDefaultValue( Boolean.FALSE );
+		bidiProcessing.setDefaultValue( Boolean.TRUE );
 		bidiProcessing.setToolTip( null );
 		bidiProcessing
 				.setDescription( getMessage( "OptionDescription.BidiProcessing" ) ); //$NON-NLS-1$
-		bidiProcessing.setEnabled( false );
 
 		// Initializes the option for TextWrapping.
 		ConfigurableOption textWrapping = new ConfigurableOption( TEXT_WRAPPING );

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
@@ -38,7 +38,6 @@
 import org.eclipse.birt.report.engine.nLayout.area.impl.BlockTextArea;
 import org.eclipse.birt.report.engine.nLayout.area.impl.ContainerArea;
 import org.eclipse.birt.report.engine.nLayout.area.impl.ImageBlockContainer;
-import org.eclipse.birt.report.engine.nLayout.area.impl.LineArea;
 import org.eclipse.birt.report.engine.nLayout.area.impl.PageArea;
 import org.eclipse.birt.report.engine.nLayout.area.impl.TableArea;
 import org.eclipse.birt.report.engine.nLayout.area.style.TextStyle;
@@ -79,7 +78,6 @@ public class PPTXRender extends PageDeviceRender
 	private boolean editMode;
 	private boolean isRTL = false;
 	private boolean isTextWrap = true;
-	private int currentLineAreaX = 0;
 
 	public PPTXRender( IEmitterServices services ) throws EngineException
 	{
@@ -207,10 +205,6 @@ protected void drawTextAt( ITextArea text, int x, int y, int width,
 	@Override
 	public void visitContainer( IContainerArea container )
 	{
-		if ( container instanceof LineArea )
-		{
-			currentLineAreaX = 0;
-		}
 		if ( container instanceof PageArea )
 		{
 			if( editMode )
@@ -314,15 +308,13 @@ private void outputText( ContainerArea text )
 		if ( editMode )
 		{
 			int x = currentX + getX( text );
-			x = Math.max( x, currentLineAreaX );
 			int y = currentY + getY( text );
 			int width = getWidth( text );
 			int height = getHeight( text );
 			TextWriter tw =new TextWriter( this );
 			tw.setLink( PPTUtil.getHyperlink( text, services, reportRunnable,
 					context ) );
 			tw.writeTextBlock( x, y, width, height, text );
-			currentLineAreaX = x + width;
 		}
 		else
 		{