summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorruoyin2011-08-18 03:13:40 (EDT)
committer xgu2011-08-31 02:00:50 (EDT)
commit936ec58d3dec10ca19b34144ab6a45b3ba4a5060 (patch)
tree5a7da71f42c70a8e44e431b0b2918b5f95240c63
parent0f1718b703fd32ed5117925faaaf91de61ae7a19 (diff)
downloadorg.eclipse.birt-936ec58d3dec10ca19b34144ab6a45b3ba4a5060.zip
org.eclipse.birt-936ec58d3dec10ca19b34144ab6a45b3ba4a5060.tar.gz
org.eclipse.birt-936ec58d3dec10ca19b34144ab6a45b3ba4a5060.tar.bz2
- Summary: Fix ted 43041 the cross table do not show correctly in doc
- Bug (s) Resolved: TED 43041 - Description: need empty paragraph to separate tables otherwise they'll be merged to a single table in doc - Tests Description: manual - Code Reviewer: - Notes to Build Team: - Notes to Developers: - Notes to QA: - Notes to Documentation:
-rw-r--r--engine/org.eclipse.birt.report.engine.emitter.wpml/src/org/eclipse/birt/report/engine/emitter/wpml/AbstractEmitterImpl.java11
-rw-r--r--engine/org.eclipse.birt.report.engine.emitter.wpml/src/org/eclipse/birt/report/engine/emitter/wpml/IWordWriter.java2
2 files changed, 13 insertions, 0 deletions
diff --git a/engine/org.eclipse.birt.report.engine.emitter.wpml/src/org/eclipse/birt/report/engine/emitter/wpml/AbstractEmitterImpl.java b/engine/org.eclipse.birt.report.engine.emitter.wpml/src/org/eclipse/birt/report/engine/emitter/wpml/AbstractEmitterImpl.java
index 6e08f85..fbcccac 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.wpml/src/org/eclipse/birt/report/engine/emitter/wpml/AbstractEmitterImpl.java
+++ b/engine/org.eclipse.birt.report.engine.emitter.wpml/src/org/eclipse/birt/report/engine/emitter/wpml/AbstractEmitterImpl.java
@@ -422,6 +422,11 @@ public abstract class AbstractEmitterImpl
}
increaseTOCLevel( list );
+ if ( context.isLastTable( ) )
+ {
+ wordWriter.insertEmptyParagraph( );
+ }
+
int width = WordUtil.convertTo( list.getWidth( ), context
.getCurrentWidth( ), reportDpi );
width = Math.min( width, context.getCurrentWidth( ) );
@@ -575,6 +580,12 @@ public abstract class AbstractEmitterImpl
wordWriter.writeCaption( caption );
}
+ if ( context.isLastTable( ) )
+ {
+ wordWriter.insertEmptyParagraph( );
+ }
+
+
int width = WordUtil.convertTo( table.getWidth( ), context
.getCurrentWidth( ), reportDpi );
int[] cols = computeTblColumnWidths( table, width );
diff --git a/engine/org.eclipse.birt.report.engine.emitter.wpml/src/org/eclipse/birt/report/engine/emitter/wpml/IWordWriter.java b/engine/org.eclipse.birt.report.engine.emitter.wpml/src/org/eclipse/birt/report/engine/emitter/wpml/IWordWriter.java
index 1136ca2..da3c4f2 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.wpml/src/org/eclipse/birt/report/engine/emitter/wpml/IWordWriter.java
+++ b/engine/org.eclipse.birt.report.engine.emitter.wpml/src/org/eclipse/birt/report/engine/emitter/wpml/IWordWriter.java
@@ -80,6 +80,8 @@ public interface IWordWriter
void insertHiddenParagraph( );
+ void insertEmptyParagraph( );
+
void endParagraph( );
void writeCaption( String txt );