moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

add text spanning support

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1162814 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sergey Vladimirov 2011-08-29 14:00:48 +00:00
parent f81a25a79c
commit 22374ff668
1 changed files with 46 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java
View File

@ -273,24 +273,11 @@ public class ExcelToFoConverter extends AbstractExcelConverter
} }
final boolean noText = ExcelToHtmlUtils.isEmpty( value ); final boolean noText = ExcelToHtmlUtils.isEmpty( value );
// final boolean wrapInDivs = !noText && isUseDivsToSpan() final boolean wrapInDivs = !noText && !cellStyle.getWrapText();
// && !cellStyle.getWrapText();
final short cellStyleIndex = cellStyle.getIndex(); final short cellStyleIndex = cellStyle.getIndex();
if ( cellStyleIndex != 0 ) if ( cellStyleIndex != 0 )
{ {
// HSSFWorkbook workbook = cell.getRow().getSheet().getWorkbook();
// String mainCssClass = getStyleClassName( workbook, cellStyle );
// if ( wrapInDivs )
// {
// tableCellElement.setAttribute( "class", mainCssClass + " "
// + cssClassContainerCell );
// }
// else
// {
// tableCellElement.setAttribute( "class", mainCssClass );
// }
if ( noText ) if ( noText )
{ {
/* /*
@ -320,43 +307,31 @@ public class ExcelToFoConverter extends AbstractExcelConverter
Text text = foDocumentFacade.createText( value ); Text text = foDocumentFacade.createText( value );
Element block = foDocumentFacade.createBlock(); Element block = foDocumentFacade.createBlock();
block.appendChild( text );
// if ( wrapInDivs ) if ( wrapInDivs )
// {
// Element outerDiv = htmlDocumentFacade.createBlock();
// outerDiv.setAttribute( "class", this.cssClassContainerDiv );
//
// Element innerDiv = htmlDocumentFacade.createBlock();
// StringBuilder innerDivStyle = new StringBuilder();
// innerDivStyle.append( "position:absolute;min-width:" );
// innerDivStyle.append( normalWidthPx );
// innerDivStyle.append( "px;" );
// if ( maxSpannedWidthPx != Integer.MAX_VALUE )
// {
// innerDivStyle.append( "max-width:" );
// innerDivStyle.append( maxSpannedWidthPx );
// innerDivStyle.append( "px;" );
// }
// innerDivStyle.append( "overflow:hidden;max-height:" );
// innerDivStyle.append( normalHeightPt );
// innerDivStyle.append( "pt;white-space:nowrap;" );
// ExcelToHtmlUtils.appendAlign( innerDivStyle,
// cellStyle.getAlignment() );
// htmlDocumentFacade.addStyleClass( outerDiv, "d",
// innerDivStyle.toString() );
//
// innerDiv.appendChild( block );
// outerDiv.appendChild( innerDiv );
// tableCellElement.appendChild( outerDiv );
// }
// else
{ {
processCellStyle( workbook, cell.getCellStyle(), tableCellElement, block.setAttribute( "absolute-position", "fixed" );
block ); block.setAttribute( "left", "0px" );
tableCellElement.appendChild( block ); block.setAttribute( "top", "0px" );
block.setAttribute( "bottom", "0px" );
block.setAttribute( "min-width", normalWidthPx + "px" );
if ( maxSpannedWidthPx != Integer.MAX_VALUE )
{
block.setAttribute( "max-width", maxSpannedWidthPx + "px" );
}
block.setAttribute( "overflow", "hidden" );
block.setAttribute( "height", normalHeightPt + "pt" );
block.setAttribute( "keep-together.within-line", "always" );
} }
processCellStyle( workbook, cell.getCellStyle(), tableCellElement,
block );
block.appendChild( text );
tableCellElement.appendChild( block );
return ExcelToHtmlUtils.isEmpty( value ) && cellStyleIndex == 0; return ExcelToHtmlUtils.isEmpty( value ) && cellStyleIndex == 0;
} }
@ -579,32 +554,31 @@ public class ExcelToFoConverter extends AbstractExcelConverter
HSSFCell cell = row.getCell( colIx ); HSSFCell cell = row.getCell( colIx );
// spanning using overlapping blocks
int divWidthPx = 0; int divWidthPx = 0;
// if ( isUseDivsToSpan() ) {
// { divWidthPx = getColumnWidth( sheet, colIx );
// divWidthPx = getColumnWidth( sheet, colIx );
// boolean hasBreaks = false;
// boolean hasBreaks = false; for ( int nextColumnIndex = colIx + 1; nextColumnIndex < maxColIx; nextColumnIndex++ )
// for ( int nextColumnIndex = colIx + 1; nextColumnIndex < {
// maxColIx; nextColumnIndex++ ) if ( !isOutputHiddenColumns()
// { && sheet.isColumnHidden( nextColumnIndex ) )
// if ( !isOutputHiddenColumns() continue;
// && sheet.isColumnHidden( nextColumnIndex ) )
// continue; if ( row.getCell( nextColumnIndex ) != null
// && !isTextEmpty( row.getCell( nextColumnIndex ) ) )
// if ( row.getCell( nextColumnIndex ) != null {
// && !isTextEmpty( row.getCell( nextColumnIndex ) ) ) hasBreaks = true;
// { break;
// hasBreaks = true; }
// break;
// } divWidthPx += getColumnWidth( sheet, nextColumnIndex );
// }
// divWidthPx += getColumnWidth( sheet, nextColumnIndex );
// } if ( !hasBreaks )
// divWidthPx = Integer.MAX_VALUE;
// if ( !hasBreaks ) }
// divWidthPx = Integer.MAX_VALUE;
// }
Element tableCellElement = foDocumentFacade.createTableCell(); Element tableCellElement = foDocumentFacade.createTableCell();