You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by se...@apache.org on 2011/07/21 05:34:58 UTC
svn commit: r1149022 - in
/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter:
WordToFoConverter.java WordToHtmlConverter.java
Author: sergey
Date: Thu Jul 21 03:34:56 2011
New Revision: 1149022
URL: http://svn.apache.org/viewvc?rev=1149022&view=rev
Log:
fix loosed formatting to endnotes and footnotes in Word-to-HTML and Word-to-FO converters
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java?rev=1149022&r1=1149021&r2=1149022&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java Thu Jul 21 03:34:56 2011
@@ -284,7 +284,17 @@ public class WordToFoConverter extends A
backwardLink.appendChild( createNoteInline( textIndex + " " ) );
backwardLink.setAttribute( "id", forwardLinkName );
endnote.appendChild( backwardLink );
- processCharacters( doc, Integer.MIN_VALUE, endnoteTextRange, endnote );
+
+ blocksProperies.push( new BlockProperies( "", -1, false, false ) );
+ try
+ {
+ processCharacters( doc, Integer.MIN_VALUE, endnoteTextRange,
+ endnote );
+ }
+ finally
+ {
+ blocksProperies.pop();
+ }
this.endnotes.add( endnote );
}
@@ -317,8 +327,16 @@ public class WordToFoConverter extends A
footnoteBody.appendChild( footnoteBlock );
footNote.appendChild( footnoteBody );
- processCharacters( doc, Integer.MIN_VALUE, footnoteTextRange,
- footnoteBlock );
+ blocksProperies.push( new BlockProperies( "", -1, false, false ) );
+ try
+ {
+ processCharacters( doc, Integer.MIN_VALUE, footnoteTextRange,
+ footnoteBlock );
+ }
+ finally
+ {
+ blocksProperies.pop();
+ }
}
protected void processHyperlink( HWPFDocumentCore wordDocument,
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java?rev=1149022&r1=1149021&r2=1149022&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java Thu Jul 21 03:34:56 2011
@@ -437,7 +437,15 @@ public class WordToHtmlConverter extends
span.setAttribute( "class", type + "notetext" );
note.appendChild( span );
- processCharacters( doc, Integer.MIN_VALUE, noteTextRange, span );
+ this.blocksProperies.add( new BlockProperies( "", -1 ) );
+ try
+ {
+ processCharacters( doc, Integer.MIN_VALUE, noteTextRange, span );
+ }
+ finally
+ {
+ this.blocksProperies.pop();
+ }
}
protected void processPageref( HWPFDocumentCore hwpfDocument,
@@ -658,6 +666,12 @@ public class WordToHtmlConverter extends
}
final Element tableElement = htmlDocumentFacade.createTable();
+ tableElement
+ .setAttribute(
+ "class",
+ htmlDocumentFacade.getOrCreateCssClass(
+ tableElement.getTagName(), "t",
+ "table-layout:fixed;border-collapse:collapse;border-spacing:0;" ) );
if ( tableHeader.hasChildNodes() )
{
tableElement.appendChild( tableHeader );
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org