=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ExcelUtils.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ExcelUtils.java 2011-02-18 12:26:26 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ExcelUtils.java 2011-03-08 07:16:52 +0000 @@ -369,7 +369,11 @@ for ( String rowItem : rows ) { - if ( rowItem.trim().matches( "0" ) ) + if ( rowItem == null ) + { + rowItem = ""; + } + else if ( rowItem.trim().matches( "0" ) ) { cellFormat.setFont( zeroFont ); } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.vm 2011-02-22 13:09:29 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.vm 2011-03-08 07:16:52 +0000 @@ -163,7 +163,7 @@ $rowMeta.name #end #foreach ( $rowItem in $col ) - #if ( $rowItem == "0" )$rowItem #else$rowItem #end + #if ( $!rowItem == "0" )$!rowItem #else$!rowItem #end #end #end