=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/action/XMLStructureResponse.java' --- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/action/XMLStructureResponse.java 2011-12-22 07:43:18 +0000 +++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/action/XMLStructureResponse.java 2012-01-12 07:06:28 +0000 @@ -170,9 +170,6 @@ xml.append( WORKBOOK_OPENTAG ); - int i = 0; - int j = 0; - for ( Integer sheetNo : collectSheets ) { Sheet sheet = WORKBOOK.getSheetAt( sheetNo - 1 ); @@ -182,24 +179,19 @@ for ( Row row : sheet ) { - j = 0; - - xml.append( "" ); + xml.append( "" ); for ( Cell cell : row ) { if ( cell.getCellType() != Cell.CELL_TYPE_BLANK ) { - xml.append( "" ); - xml.append( "" ); + xml.append( "" ); + xml.append( "" ); xml.append( "" ); } - - j++; } - - i++; - xml.append( "" ); } xml.append( "" ); @@ -261,7 +253,8 @@ for ( Cell cell : row ) { // Remember that empty cells can contain format information - if ( (cell.getCellStyle() != null) || cell.getCellType() != Cell.CELL_TYPE_BLANK ) + if ( (cell.getCellStyle() != null || cell.getCellType() != Cell.CELL_TYPE_BLANK) + && !s.isColumnHidden( cell.getColumnIndex() ) ) { xml.append( "" ); xml.append( "