mirror of https://github.com/apache/poi.git
do not allow two elements to have same IDs in result of Word-to-FO converter
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1149610 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
4997081f21
commit
94fbeaa50a
|
@ -19,8 +19,11 @@ package org.apache.poi.hwpf.converter;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileWriter;
|
import java.io.FileWriter;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.LinkedHashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
import java.util.Stack;
|
import java.util.Stack;
|
||||||
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
|
||||||
import javax.xml.parsers.DocumentBuilderFactory;
|
import javax.xml.parsers.DocumentBuilderFactory;
|
||||||
import javax.xml.transform.OutputKeys;
|
import javax.xml.transform.OutputKeys;
|
||||||
|
@ -136,6 +139,10 @@ public class WordToFoConverter extends AbstractWordConverter
|
||||||
|
|
||||||
protected final FoDocumentFacade foDocumentFacade;
|
protected final FoDocumentFacade foDocumentFacade;
|
||||||
|
|
||||||
|
private AtomicInteger internalLinkCounter = new AtomicInteger( 1 );
|
||||||
|
|
||||||
|
private Set<String> usedIds = new LinkedHashSet<String>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates new instance of {@link WordToFoConverter}. Can be used for output
|
* Creates new instance of {@link WordToFoConverter}. Can be used for output
|
||||||
* several {@link HWPFDocument}s into single FO document.
|
* several {@link HWPFDocument}s into single FO document.
|
||||||
|
@ -260,9 +267,17 @@ public class WordToFoConverter extends AbstractWordConverter
|
||||||
for ( Bookmark bookmark : rangeBookmarks )
|
for ( Bookmark bookmark : rangeBookmarks )
|
||||||
{
|
{
|
||||||
Element bookmarkElement = foDocumentFacade.createInline();
|
Element bookmarkElement = foDocumentFacade.createInline();
|
||||||
bookmarkElement.setAttribute( "id", bookmark.getName() );
|
final String idName = "bookmark_" + bookmark.getName();
|
||||||
parent.appendChild( bookmarkElement );
|
// make sure ID used once
|
||||||
parent = bookmarkElement;
|
if ( setId( bookmarkElement, idName ) )
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* if it just empty fo:inline without "id" attribute doesn't
|
||||||
|
* making sense to add it to DOM
|
||||||
|
*/
|
||||||
|
parent.appendChild( bookmarkElement );
|
||||||
|
parent = bookmarkElement;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( range != null )
|
if ( range != null )
|
||||||
|
@ -290,21 +305,22 @@ public class WordToFoConverter extends AbstractWordConverter
|
||||||
protected void processEndnoteAutonumbered( HWPFDocument doc, int noteIndex,
|
protected void processEndnoteAutonumbered( HWPFDocument doc, int noteIndex,
|
||||||
Element block, Range endnoteTextRange )
|
Element block, Range endnoteTextRange )
|
||||||
{
|
{
|
||||||
final String textIndex = String.valueOf( noteIndex + 1 );
|
final String textIndex = String.valueOf( internalLinkCounter
|
||||||
|
.incrementAndGet() );
|
||||||
final String forwardLinkName = "endnote_" + textIndex;
|
final String forwardLinkName = "endnote_" + textIndex;
|
||||||
final String backwardLinkName = "endnote_back_" + textIndex;
|
final String backwardLinkName = "endnote_back_" + textIndex;
|
||||||
|
|
||||||
Element forwardLink = foDocumentFacade
|
Element forwardLink = foDocumentFacade
|
||||||
.createBasicLinkInternal( forwardLinkName );
|
.createBasicLinkInternal( forwardLinkName );
|
||||||
forwardLink.appendChild( createNoteInline( textIndex ) );
|
forwardLink.appendChild( createNoteInline( textIndex ) );
|
||||||
forwardLink.setAttribute( "id", backwardLinkName );
|
setId( forwardLink, backwardLinkName );
|
||||||
block.appendChild( forwardLink );
|
block.appendChild( forwardLink );
|
||||||
|
|
||||||
Element endnote = foDocumentFacade.createBlock();
|
Element endnote = foDocumentFacade.createBlock();
|
||||||
Element backwardLink = foDocumentFacade
|
Element backwardLink = foDocumentFacade
|
||||||
.createBasicLinkInternal( backwardLinkName );
|
.createBasicLinkInternal( backwardLinkName );
|
||||||
backwardLink.appendChild( createNoteInline( textIndex + " " ) );
|
backwardLink.appendChild( createNoteInline( textIndex + " " ) );
|
||||||
backwardLink.setAttribute( "id", forwardLinkName );
|
setId( backwardLink, forwardLinkName );
|
||||||
endnote.appendChild( backwardLink );
|
endnote.appendChild( backwardLink );
|
||||||
|
|
||||||
blocksProperies.push( new BlockProperies( "", -1, false, false ) );
|
blocksProperies.push( new BlockProperies( "", -1, false, false ) );
|
||||||
|
@ -326,7 +342,8 @@ public class WordToFoConverter extends AbstractWordConverter
|
||||||
protected void processFootnoteAutonumbered( HWPFDocument doc,
|
protected void processFootnoteAutonumbered( HWPFDocument doc,
|
||||||
int noteIndex, Element block, Range footnoteTextRange )
|
int noteIndex, Element block, Range footnoteTextRange )
|
||||||
{
|
{
|
||||||
final String textIndex = String.valueOf( noteIndex + 1 );
|
final String textIndex = String.valueOf( internalLinkCounter
|
||||||
|
.incrementAndGet() );
|
||||||
final String forwardLinkName = "footnote_" + textIndex;
|
final String forwardLinkName = "footnote_" + textIndex;
|
||||||
final String backwardLinkName = "footnote_back_" + textIndex;
|
final String backwardLinkName = "footnote_back_" + textIndex;
|
||||||
|
|
||||||
|
@ -337,7 +354,7 @@ public class WordToFoConverter extends AbstractWordConverter
|
||||||
Element forwardLink = foDocumentFacade
|
Element forwardLink = foDocumentFacade
|
||||||
.createBasicLinkInternal( forwardLinkName );
|
.createBasicLinkInternal( forwardLinkName );
|
||||||
forwardLink.appendChild( createNoteInline( textIndex ) );
|
forwardLink.appendChild( createNoteInline( textIndex ) );
|
||||||
forwardLink.setAttribute( "id", backwardLinkName );
|
setId( forwardLink, backwardLinkName );
|
||||||
inline.appendChild( forwardLink );
|
inline.appendChild( forwardLink );
|
||||||
footNote.appendChild( inline );
|
footNote.appendChild( inline );
|
||||||
|
|
||||||
|
@ -346,7 +363,7 @@ public class WordToFoConverter extends AbstractWordConverter
|
||||||
Element backwardLink = foDocumentFacade
|
Element backwardLink = foDocumentFacade
|
||||||
.createBasicLinkInternal( backwardLinkName );
|
.createBasicLinkInternal( backwardLinkName );
|
||||||
backwardLink.appendChild( createNoteInline( textIndex + " " ) );
|
backwardLink.appendChild( createNoteInline( textIndex + " " ) );
|
||||||
backwardLink.setAttribute( "id", forwardLinkName );
|
setId( backwardLink, forwardLinkName );
|
||||||
footnoteBlock.appendChild( backwardLink );
|
footnoteBlock.appendChild( backwardLink );
|
||||||
footnoteBody.appendChild( footnoteBlock );
|
footnoteBody.appendChild( footnoteBlock );
|
||||||
footNote.appendChild( footnoteBody );
|
footNote.appendChild( footnoteBody );
|
||||||
|
@ -416,7 +433,8 @@ public class WordToFoConverter extends AbstractWordConverter
|
||||||
Element currentBlock, Range textRange, int currentTableLevel,
|
Element currentBlock, Range textRange, int currentTableLevel,
|
||||||
String pageref )
|
String pageref )
|
||||||
{
|
{
|
||||||
Element basicLink = foDocumentFacade.createBasicLinkInternal( pageref );
|
Element basicLink = foDocumentFacade
|
||||||
|
.createBasicLinkInternal( "bookmark_" + pageref );
|
||||||
currentBlock.appendChild( basicLink );
|
currentBlock.appendChild( basicLink );
|
||||||
|
|
||||||
if ( textRange != null )
|
if ( textRange != null )
|
||||||
|
@ -611,4 +629,19 @@ public class WordToFoConverter extends AbstractWordConverter
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected boolean setId( Element element, final String id )
|
||||||
|
{
|
||||||
|
// making sure ID used once
|
||||||
|
if ( usedIds.contains( id ) )
|
||||||
|
{
|
||||||
|
logger.log( POILogger.WARN,
|
||||||
|
"Tried to create element with same ID '", id, "'. Skipped" );
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
element.setAttribute( "id", id );
|
||||||
|
usedIds.add( id );
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue