Attachment 96282 Details for Bug 225536 – Patch for Excel emitter

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch for Excel emitter

excel_080416.diff (text/plain), 4.84 KB, created by Lina Kemmel

on 2008-04-16 12:49:56 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Lina Kemmel

Created: 2008-04-16 12:49:56 EDT

Size: 4.84 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.birt.report.engine.emitter.prototype.excel
>Index: src/org/eclipse/birt/report/engine/emitter/excel/StyleConstant.java
>===================================================================
>RCS file: /cvsroot/birt/source/org.eclipse.birt.report.engine.emitter.prototype.excel/src/org/eclipse/birt/report/engine/emitter/excel/StyleConstant.java,v
>retrieving revision 1.4
>diff -u -r1.4 StyleConstant.java
>--- src/org/eclipse/birt/report/engine/emitter/excel/StyleConstant.java	11 Oct 2007 10:01:27 -0000	1.4
>+++ src/org/eclipse/birt/report/engine/emitter/excel/StyleConstant.java	16 Apr 2008 16:47:03 -0000
>@@ -1,8 +1,10 @@
> package org.eclipse.birt.report.engine.emitter.excel;
> 
> public interface StyleConstant {
>-    
>-    public static final int COUNT = 27;
>+
>+    // bidi_hcg: changed number of styles due to direction added.    
>+    public static final int COUNT = 28;
>+    //27;
>     
>     public static final int FONT_FAMILY_PROP = 0;
>     public static final int FONT_SIZE_PROP = 1;
>@@ -40,6 +42,8 @@
>     public static final int DATA_TYPE_PROP = 25;
>     public static final int TEXT_TRANSFORM = 26;
>     
>+    public static final int DIRECTION_PROP = 27; // bidi_hcg
>+
> 	public static final String NULL = "NULL";  
> 		
> }
>Index: src/org/eclipse/birt/report/engine/emitter/excel/ExcelWriter.java
>===================================================================
>RCS file: /cvsroot/birt/source/org.eclipse.birt.report.engine.emitter.prototype.excel/src/org/eclipse/birt/report/engine/emitter/excel/ExcelWriter.java,v
>retrieving revision 1.29
>diff -u -r1.29 ExcelWriter.java
>--- src/org/eclipse/birt/report/engine/emitter/excel/ExcelWriter.java	16 Apr 2008 09:04:31 -0000	1.29
>+++ src/org/eclipse/birt/report/engine/emitter/excel/ExcelWriter.java	16 Apr 2008 16:47:03 -0000
>@@ -7,7 +7,6 @@
> import java.io.IOException;
> import java.io.OutputStream;
> import java.io.PrintWriter;
>-import java.util.ArrayList;
> import java.util.HashSet;
> import java.util.Iterator;
> import java.util.List;
>@@ -16,12 +15,11 @@
> import java.util.logging.Logger;
> import org.eclipse.birt.report.engine.content.IHyperlinkAction;
> import org.eclipse.birt.report.engine.content.IReportContent;
>+import org.eclipse.birt.report.engine.css.engine.value.birt.BIRTConstants;
> import org.eclipse.birt.report.engine.css.engine.value.css.CSSConstants;
> import org.eclipse.birt.report.engine.emitter.XMLWriter;
> import org.eclipse.birt.report.engine.emitter.excel.layout.ExcelContext;
>-import org.eclipse.birt.report.model.api.ReportDesignHandle;
> import org.eclipse.birt.report.model.api.core.IModuleModel;
>-import org.eclipse.birt.report.model.elements.Style;
> 
> public class ExcelWriter
> {
>@@ -280,7 +278,8 @@
> 		writer.closeTag( "Cell" );
> 	}
> 
>-	public void writeAlignment( String horizontal, String vertical, boolean wrapText )
>+	public void writeAlignment( String horizontal, String vertical,
>+			String direction, boolean wrapText )
> 	{
> 		writer.openTag( "Alignment" );
> 
>@@ -293,7 +292,14 @@
> 		{
> 			writer.attribute( "ss:Vertical", vertical );
> 		}
>-
>+		// bidi_hcg: Write direction attribute
>+		if ( isValid( direction ) )
>+		{
>+			if ( BIRTConstants.BIRT_RTL_VALUE.equals( direction ) )
>+				writer.attribute( "ss:ReadingOrder", "RightToLeft" );
>+			else
>+				writer.attribute( "ss:ReadingOrder", "LeftToRight" );
>+		}
> 		if(wrapText)
> 		{
> 			writer.attribute( "ss:WrapText", "1" );
>@@ -392,12 +398,14 @@
> 
> 		if ( id >= StyleEngine.RESERVE_STYLE_ID )
> 		{
>+			String direction = style
>+					.getProperty( StyleConstant.DIRECTION_PROP ); // bidi_hcg
> 			String horizontalAlign = style
> 					.getProperty( StyleConstant.H_ALIGN_PROP );
> 			String verticalAlign = style
> 					.getProperty( StyleConstant.V_ALIGN_PROP );
>-			writeAlignment( horizontalAlign, verticalAlign ,wrapText);
>-
>+			writeAlignment( horizontalAlign, verticalAlign, direction,
>+					wrapText );
> 			writer.openTag( "Borders" );
> 			String bottomColor = style
> 					.getProperty( StyleConstant.BORDER_BOTTOM_COLOR_PROP );
>Index: src/org/eclipse/birt/report/engine/emitter/excel/StyleBuilder.java
>===================================================================
>RCS file: /cvsroot/birt/source/org.eclipse.birt.report.engine.emitter.prototype.excel/src/org/eclipse/birt/report/engine/emitter/excel/StyleBuilder.java,v
>retrieving revision 1.10
>diff -u -r1.10 StyleBuilder.java
>--- src/org/eclipse/birt/report/engine/emitter/excel/StyleBuilder.java	18 Jan 2008 09:23:37 -0000	1.10
>+++ src/org/eclipse/birt/report/engine/emitter/excel/StyleBuilder.java	16 Apr 2008 16:47:03 -0000
>@@ -132,6 +132,11 @@
> 		
>         entry.setProperty( StyleConstant.TEXT_TRANSFORM, style
> 				.getTextTransform( ) );
>+
>+		// bidi_hcg: direction
>+		entry.setProperty( StyleConstant.DIRECTION_PROP, style
>+				.getDirection( ) );
>+
> 		return entry;
> 	}
>

Flags:

bjorn.freeman-benson: iplog+
Lina.Kemmel: review?

Actions: View | Diff

Attachments on bug 225536: 95596 | 95598 | 96157 | 96159 | 96282 | 96299 | 96652 | 99946 | 101888 | 103603