diff --git a/engine/org.eclipse.birt.report.engine.emitter.wpml/src/org/eclipse/birt/report/engine/emitter/wpml/writer/AbstractWordXmlWriter.java b/engine/org.eclipse.birt.report.engine.emitter.wpml/src/org/eclipse/birt/report/engine/emitter/wpml/writer/AbstractWordXmlWriter.java index 5045b052996..28f0856f046 100644 --- a/engine/org.eclipse.birt.report.engine.emitter.wpml/src/org/eclipse/birt/report/engine/emitter/wpml/writer/AbstractWordXmlWriter.java +++ b/engine/org.eclipse.birt.report.engine.emitter.wpml/src/org/eclipse/birt/report/engine/emitter/wpml/writer/AbstractWordXmlWriter.java @@ -226,11 +226,11 @@ public void startTable( IStyle style, int tablewidth, boolean inForeign ) { writer.openTag( "w:tbl" ); writer.openTag( "w:tblPr" ); - writeTableIndent( style ); + writeTableIndent( ); writeAttrTag( "w:tblStyle", "TableGrid" ); writeAttrTag( "w:tblOverlap", "Never" ); writeBidiTable( ); - writeTableWidth( style, tablewidth ); + writeTableWidth( tablewidth ); writeAttrTag( "w:tblLook", "01E0" ); writeTableLayout( ); writeTableBorders( style ); @@ -289,25 +289,14 @@ private void writeTableWidth( int tablewidth ) writer.closeTag( "w:tblW" ); } - private void writeTableIndent( IStyle style ) + private void writeTableIndent( ) { writer.openTag( "w:tblInd" ); - writer.attribute( "w:w", - WordUtil.milliPt2Twips( PropertyUtil.getDimensionValue( style - .getProperty( StyleConstants.STYLE_MARGIN_LEFT ) ) ) ); + writer.attribute( "w:w", 0 ); writer.attribute( "w:type", "dxa" ); writer.closeTag( "w:tblInd" ); } - private void writeTableWidth( IStyle style, int tablewidth ) - { - int leftSpace = WordUtil.milliPt2Twips( PropertyUtil.getDimensionValue( - style.getProperty( StyleConstants.STYLE_MARGIN_LEFT ) ) ); - int rightSpace = WordUtil.milliPt2Twips( PropertyUtil.getDimensionValue( - style.getProperty( StyleConstants.STYLE_MARGIN_RIGHT ) ) ); - writeTableWidth( tablewidth - leftSpace - rightSpace ); - } - protected void writeBorders( IStyle style, int bottomMargin, int topMargin, int leftMargin, int rightMargin ) { diff --git a/engine/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/emitter/EmitterUtil.java b/engine/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/emitter/EmitterUtil.java index b1ee073297d..bb81fcc1376 100644 --- a/engine/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/emitter/EmitterUtil.java +++ b/engine/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/emitter/EmitterUtil.java @@ -582,8 +582,6 @@ else if ( color.equalsIgnoreCase( "Fuchsia" ) ) return "FF00FF"; else if ( color.equalsIgnoreCase( "Maroon" ) ) return "800000"; - else if ( color.equalsIgnoreCase( "Orange" ) ) - return "#FFA500"; String[] values = color.substring( color.indexOf( "(" ) + 1, color.length( ) - 1 ).split( "," ); String value = "";