Merge branch 'master' into 2.5.x

Author: pstoellberger

saiku-bi-platform-plugin/src/main/plugin/lib/saiku.properties

@@ -4,6 +4,7 @@
 saiku.olap.nonempty = true
 saiku.web.export.csv.name = saiku-export
 saiku.web.export.excel.name = saiku-export
+saiku.web.export.excel.format = xlsx
 
 saiku.web.export.excel.numberformat=#,##0.00
 

saiku-core/saiku-web/src/main/java/org/saiku/web/rest/resources/QueryResource.java

@@ -305,10 +305,10 @@ public Response getQueryExcelExport(
 		}
 		try {
 			byte[] doc = olapQueryService.getExport(queryName,"xls",format);
-			String name = SaikuProperties.webExportExcelName;
+			String name = SaikuProperties.webExportExcelName + "." + SaikuProperties.webExportExcelFormat;
 			return Response.ok(doc, MediaType.APPLICATION_OCTET_STREAM).header(
 					"content-disposition",
-					"attachment; filename = " + name + ".xls").header(
+					"attachment; filename = " + name).header(
 							"content-length",doc.length).build();
 		}
 		catch (Exception e) {

saiku-webapp/src/main/webapp/WEB-INF/classes/saiku.properties

@@ -4,6 +4,7 @@
 saiku.olap.nonempty = true
 saiku.web.export.csv.name = saiku-export
 saiku.web.export.excel.name = saiku-export
+saiku.web.export.excel.format = xlsx
 saiku.web.export.excel.numberformat=#,##0.00
 
 saiku.format.numberformat=#,##0.00