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/12 16:40:06 UTC
svn commit: r1145609 - in
/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter:
AbstractWordConverter.java HtmlDocumentFacade.java WordToFoConverter.java
WordToHtmlConverter.java
Author: sergey
Date: Tue Jul 12 14:40:06 2011
New Revision: 1145609
URL: http://svn.apache.org/viewvc?rev=1145609&view=rev
Log:
add line breaks (0xb) support
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java
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/AbstractWordConverter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java?rev=1145609&r1=1145608&r2=1145609&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java Tue Jul 12 14:40:06 2011
@@ -155,7 +155,31 @@ public abstract class AbstractWordConver
|| ( text.charAt( text.length() - 1 ) == BEL_MARK && currentTableLevel != 0 ) )
text = text.substring( 0, text.length() - 1 );
- outputCharacters( block, characterRun, text );
+ {
+ // line breaks
+ StringBuilder stringBuilder = new StringBuilder();
+ for ( char charChar : text.toCharArray() )
+ {
+ if ( charChar == 11 )
+ {
+ if ( stringBuilder.length() > 0 )
+ {
+ outputCharacters( block, characterRun, stringBuilder.toString() );
+ stringBuilder.setLength( 0 );
+ }
+ processLineBreak(block, characterRun);
+ }
+ else
+ {
+ stringBuilder.append( charChar );
+ }
+ }
+ if ( stringBuilder.length() > 0 )
+ {
+ outputCharacters( block, characterRun, stringBuilder.toString() );
+ stringBuilder.setLength( 0 );
+ }
+ }
haveAnyText |= text.trim().length() != 0;
}
@@ -293,6 +317,9 @@ public abstract class AbstractWordConver
protected abstract void processImage( Element currentBlock,
boolean inlined, Picture picture );
+ protected abstract void processLineBreak( Element block,
+ CharacterRun characterRun );
+
protected abstract void processPageref( HWPFDocumentCore wordDocument,
Element currentBlock, Range textRange, int currentTableLevel,
String pageref );
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java?rev=1145609&r1=1145608&r2=1145609&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java Tue Jul 12 14:40:06 2011
@@ -82,6 +82,11 @@ public class HtmlDocumentFacade
return basicLink;
}
+ public Element createLineBreak()
+ {
+ return document.createElement( "br" );
+ }
+
public Element createListItem()
{
return document.createElement( "li" );
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=1145609&r1=1145608&r2=1145609&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 Tue Jul 12 14:40:06 2011
@@ -294,6 +294,12 @@ public class WordToFoConverter extends A
+ "' can be here" ) );
}
+ @Override
+ protected void processLineBreak( Element block, CharacterRun characterRun )
+ {
+ block.appendChild( foDocumentFacade.createBlock() );
+ }
+
protected void processPageref( HWPFDocumentCore hwpfDocument,
Element currentBlock, Range textRange, int currentTableLevel,
String pageref )
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=1145609&r1=1145608&r2=1145609&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 Tue Jul 12 14:40:06 2011
@@ -251,6 +251,12 @@ public class WordToHtmlConverter extends
basicLink );
}
+ @Override
+ protected void processLineBreak( Element block, CharacterRun characterRun )
+ {
+ block.appendChild( htmlDocumentFacade.createLineBreak() );
+ }
+
/**
* This method shall store image bytes in external file and convert it if
* necessary. Images shall be stored using PNG format. Other formats may be
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org