@sapui5/sap.ui.export 1.100.0 → 1.102.1

package/src/sap/ui/export/PortableDocument.js

@@ -5,18 +5,19 @@
 
 sap.ui.define([
 	'sap/base/Log',
+	'sap/m/MessageToast',
 	'sap/ui/core/Core',
 	'sap/ui/export/ExportBase',
 	'sap/ui/export/ExportUtils',
 	'sap/ui/model/odata/v4/ODataModel'
-], function(Log, Core, ExportBase, ExportUtils, ODataModel) {
+], function(Log, MessageToast, Core, ExportBase, ExportUtils, ODataModel) {
 	'use strict';
 
 	/**
 	 * @constructor The <code>sap.ui.export.PortableDocument</code> class allows you to export table data from a UI5 application to a Portable Document Format (*.PDF) file.
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.102.1
 	 *
 	 * @since 1.96
 	 * @alias sap.ui.export.PortableDocument
@@ -30,7 +31,7 @@ sap.ui.define([
 
 
 			/* Only apply supported properties */
-			['paperSize', 'orientation', 'font', 'fontSize', 'doEnableAccessibility', 'signature', 'signatureReason'].forEach(function(sProperty) {
+			['paperSize', 'orientation', 'font', 'fontSize', 'doEnableAccessibility', 'fitToPage', 'signature', 'signatureReason', 'pdfArchive'].forEach(function(sProperty) {
 				if (typeof mSettings[sProperty] !== 'undefined') {
 					this._mSettings[sProperty] = mSettings[sProperty];
 				}
@@ -42,9 +43,9 @@ sap.ui.define([
 	 * Sets the data source configuration that will be used for exporting the data. If the passed parameter is null,
 	 * the call will be ignored.
 	 *
-	 * @param {Object|sap.ui.model.ListBinding|sap.ui.model.TreeBinding} oDataSource Possible types are a data
+	 * @param {object|sap.ui.model.ListBinding|sap.ui.model.TreeBinding} oDataSource Possible types are a data
 	 * source configuration, a <code>sap.ui.model.ListBinding</code> or <code>sap.ui.model.TreeBinding</code>
-	 * @returns {Object|null} - Valid dataSource object or null in case the dataSource configuration is not supported
+	 * @returns {object|null} - Valid dataSource object or null in case the dataSource configuration is not supported
 	 *
 	 * @since 1.96
 	 * @public
@@ -78,7 +79,7 @@ sap.ui.define([
 	 * Creates a valid dataSource configuration
 	 *
 	 * @param {sap.ui.model.ListBinding|sap.ui.model.TreeBinding} oBinding - A subclass of <code>sap.ui.model.ListBinding</code> or <code>sap.ui.model.TreeBinding</code>
-	 * @returns {Object} - Valid data source configuration built upon the ListBinding
+	 * @returns {object} - Valid data source configuration built upon the ListBinding
 	 */
 	 PortableDocument.prototype.createDataSourceFromBinding = function(oBinding) {
 
@@ -135,8 +136,8 @@ sap.ui.define([
 	 * Creates the DocumentDescription based on the given export
 	 * settings and assigns a unique Id to it.
 	 *
-	 * @param {Object} mSettings Export settings
-	 * @returns {Object} DocumentDescription object that contains all relevant export settings
+	 * @param {object} mSettings Export settings
+	 * @returns {object} DocumentDescription object that contains all relevant export settings
 	 * @private
 	 */
 	PortableDocument.prototype._createDocumentDescription = function(mSettings) {
@@ -149,7 +150,14 @@ sap.ui.define([
 				"PaperSize": mSettings.paperSize,
 				"Orientation": mSettings.orientation,
 				"FontSize": Number(mSettings.fontSize),
-				"DoEnableAccessibility": mSettings.doEnableAccessibility
+				"FitToPage": {
+					"IsEnabled": mSettings.fitToPage,
+					"MinimumFontSize": 4
+				}
+			},
+			"PDFStandard": {
+				"DoEnableAccessibility": mSettings.doEnableAccessibility,
+				"UsePDFAConformance": mSettings.pdfArchive
 			},
 			"Signature": {
 				"DoSign": mSettings.signature,
@@ -192,7 +200,7 @@ sap.ui.define([
 			}
 		}
 
-		/* Eliminate duplicates and navigation properties before adding columns */
+		/* Eliminate duplicates before adding columns */
 		oWorkbook.columns.filter(function(oColumn, iIndex, aArray) {
 			var sProperty = Array.isArray(oColumn.property) ? oColumn.property[0] : oColumn.property;
 
@@ -200,7 +208,7 @@ sap.ui.define([
 				var sOtherProperty = Array.isArray(oOtherColumn.property) ? oOtherColumn.property[0] : oOtherColumn.property;
 
 				return sProperty === sOtherProperty;
-			}) === iIndex && !/^to_\w+\/\w+/.test(sProperty);
+			}) === iIndex;
 		}).forEach(function(oColumn) {
 			oDocumentDescription["TableColumns"].push({
 				"Name": Array.isArray(oColumn.property) ? oColumn.property[0] : oColumn.property,
@@ -214,7 +222,7 @@ sap.ui.define([
 	/**
 	 * Returns the name of the EntitySet that is being used with the given OData version.
 	 *
-	 * @param {Object} mDataSource DataSource object containing information about OData version
+	 * @param {object} mDataSource DataSource object containing information about OData version
 	 * @returns {string} Name of the EntitySet according to the OData version
 	 */
 	PortableDocument.prototype._getEntitySetName = function(mDataSource) {
@@ -226,7 +234,7 @@ sap.ui.define([
 	/**
 	 * Returns the specific ODataModel that is being used for binding to the DocumentDescription EntitySet
 	 *
-	 * @param {Object} oDataSource DataSource settings of the export configuration
+	 * @param {object} oDataSource DataSource settings of the export configuration
 	 * @returns {ODataModel} ODataModel, either V2 or V4.
 	 */
 	PortableDocument.prototype._getModel = function(oDataSource) {
@@ -241,7 +249,7 @@ sap.ui.define([
 	/**
 	 * Applies default settings to the export configuration.
 	 *
-	 * @param {Object} mSettings Export configuration object
+	 * @param {object} mSettings Export configuration object
 	 * @returns {Promise} Promise that gets resolved when the default settings have been applied
 	 */
 	PortableDocument.prototype.setDefaultExportSettings = function(mSettings) {
@@ -251,7 +259,7 @@ sap.ui.define([
 			oContext = mSettings.workbook.context = {};
 		}
 
-		if (typeof oContext.title === 'string') {
+		if (typeof oContext.title === 'string' && oContext.title) {
 			return Promise.resolve();
 		}
 
@@ -265,71 +273,92 @@ sap.ui.define([
 	 * DocumentDescription. The corresponding Id is assigned by
 	 * the backend and passed to the event handler functions.
 	 *
-	 * @param {Object} oDocumentDescription DocumentDescription instance that is being created
-	 * @param {Object} oDataSource DataSource settings of the export configuration
-	 * @param {function} fnSuccess Success handler function
-	 * @param {function} fnError Error handler function
+	 * @param {object} oDocumentDescription DocumentDescription instance that is being created
+	 * @param {object} oDataSource DataSource settings of the export configuration
+	 *
+	 * @returns {Promise} A Promise that resolves with the newly created Id of the DocumentDescription
 	 */
-	PortableDocument.prototype.postDocumentDescription = function(oDocumentDescription, oDataSource, fnSuccess, fnError) {
+	PortableDocument.prototype.postDocumentDescription = function(oDocumentDescription, oDataSource) {
 		var oBinding, oModel, sPath;
 
 		oModel = this._getModel(oDataSource);
 		sPath = '/' + this._getEntitySetName(oDataSource);
 
 		if (!oModel || !oModel.isA(['sap.ui.model.odata.v4.ODataModel', 'sap.ui.model.odata.v2.ODataModel'])) {
-			fnError('Unsupported Model');
+			return Promise.reject('Unsupported Model');
 		}
 
-		if (oModel.isA('sap.ui.model.odata.v4.ODataModel')) {
-			oBinding = oModel.bindList(sPath);
+		return new Promise(function(fnResolve, fnReject) {
 
-			oBinding.attachCreateCompleted(function(oEvent) {
-				var success = oEvent.getParameter('success');
+			if (oModel.isA('sap.ui.model.odata.v4.ODataModel')) {
+				oBinding = oModel.bindList(sPath);
 
-				if (success) {
-					fnSuccess(oEvent.getParameter('context').getObject()['Id']);
-				} else {
-					fnError();
-				}
-			});
+				oBinding.attachCreateCompleted(function(oEvent) {
+					var success = oEvent.getParameter('success');
 
-			oBinding.create(oDocumentDescription);
-		} else {
-			var bUseBatch = oModel.bUseBatch;
-
-			oModel.setUseBatch(false);
-			oModel.create(sPath, oDocumentDescription, {
-				success: function(oData) {
-					oModel.setUseBatch(bUseBatch);
-					fnSuccess(oData['Id']);
-				},
-				error: function(oError) {
-					oModel.setUseBatch(bUseBatch);
-					fnError(oError);
-				}
-			});
-		}
+					if (success) {
+						fnResolve(oEvent.getParameter('context').getObject()['Id']);
+					} else {
+						fnReject();
+					}
+				});
+
+				oBinding.create(oDocumentDescription);
+			} else {
+				var bUseBatch = oModel.bUseBatch;
+
+				oModel.setUseBatch(false);
+				oModel.create(sPath, oDocumentDescription, {
+					success: function(oData) {
+						oModel.setUseBatch(bUseBatch);
+						fnResolve(oData['Id']);
+					},
+					error: function(oError) {
+						oModel.setUseBatch(bUseBatch);
+						fnReject(oError);
+					}
+				});
+			}
+		});
 	};
 
 	/**
 	 * Triggers the export process and returns a Promise the
 	 * gets resolved as soon as the export is finished.
 	 *
-	 * @param {Object} mSettings Export settings
+	 * @param {object} mSettings Export settings
 	 * @returns {Promise} Promise that is being resolved as soon as the PDF export is finished
 	 */
 	PortableDocument.prototype.createBuildPromise = function(mSettings) {
 		var that = this;
+		var oDocumentDescription;
+		var oBusyDialog;
+		var oResourceBundle = Core.getLibraryResourceBundle('sap.ui.export');
+
+		oBusyDialog = new sap.m.BusyDialog('PDFExportBusyDialog', {
+			title: oResourceBundle.getText('PROGRESS_TITLE'),
+			text: oResourceBundle.getText('PDF_GENERATION_IN_PROGRESS'),
+			showCancelButton: true,
+			close: function(oEvent) {
+				if (oEvent.getParameter('cancelPressed')) {
+					that.cancel();
+					oBusyDialog.destroy();
+					oBusyDialog = null;
+				}
+			}
+		});
 
-		return new Promise(function(fnResolve, fnReject) {
-			var oDocumentDescription;
+		oDocumentDescription = that._createDocumentDescription(mSettings);
 
-			oDocumentDescription = that._createDocumentDescription(mSettings);
-			that.postDocumentDescription(oDocumentDescription, mSettings.dataSource, fnResolve, fnReject);
+		return that.postDocumentDescription(oDocumentDescription, mSettings.dataSource).then(function(sDocumentDescriptionId) {
+			oBusyDialog.open();
 
-		}).then(function(sDocumentDescriptionId) {
-			return that.sendRequest(mSettings.dataSource.dataUrl, sDocumentDescriptionId).then(function(response) {
+			return oBusyDialog && that.sendRequest(mSettings.dataSource.dataUrl, sDocumentDescriptionId).then(function(response) {
 				ExportUtils.saveAsFile(response, mSettings.fileName);
+				oBusyDialog.destroy();
+			}).catch(function(oError) {
+				oBusyDialog.destroy();
+				sap.m.MessageToast.show('Error during PDF export!');
 			});
 		});
 	};
@@ -348,8 +377,8 @@ sap.ui.define([
 			/* Send GET request to receive PDF file */
 			oXHR.open('GET', sUrl);
 			oXHR.responseType = 'blob';
-			oXHR.setRequestHeader("Accept", "application/pdf");
-			oXHR.setRequestHeader("SAP-Document-Description-Id", sDocumentDescriptionId);
+			oXHR.setRequestHeader('Accept', this.getMimeType());
+			oXHR.setRequestHeader('SAP-Document-Description-Id', sDocumentDescriptionId);
 
 			oXHR.addEventListener('abort', function() {
 				fnReject('Request aborted');
@@ -373,6 +402,15 @@ sap.ui.define([
 		}.bind(this));
 	};
 
+	/**
+	 * Returns the specific MIME type
+	 *
+	 * @returns {string} MIME type for Portable Document Format
+	 */
+	PortableDocument.prototype.getMimeType = function() {
+		return 'application/pdf';
+	};
+
 	/**
 	 * Cancels the active request. If the request has not been sent
 	 * or the response has been received already, this function has

package/src/sap/ui/export/Spreadsheet.js

@@ -83,7 +83,7 @@ sap.ui.define([
 		 *      <li><code>workbook.context</code> - Context object that will be applied to the generated file. It may contain the following fields:</li>
 		 *      <ul>
 		 *          <li><code>application</code> (string) - The application that creates the XLSX document (default: "SAP UI5")</li>
-		 *          <li><code>version</code> (string) - Application version that creates the XLSX document (default: "1.100.0")</li>
+		 *          <li><code>version</code> (string) - Application version that creates the XLSX document (default: "1.102.1")</li>
 		 *          <li><code>title</code> (string) - Title of the XLSX document (NOT the filename)</li>
 		 *          <li><code>modifiedBy</code> (string) - User context for the XLSX document</li>
 		 *          <li><code>sheetName</code> (string) - The label of the data sheet</li>
@@ -166,7 +166,7 @@ sap.ui.define([
 		 *       columns: aColumns,
 		 *       context: {
 		 *         application: 'Debug Test Application',
-		 *         version: '1.100.0',
+		 *         version: '1.102.1',
 		 *         title: 'Some random title',
 		 *         modifiedBy: 'John Doe',
 		 *         metaSheetName: 'Custom metadata',
@@ -248,10 +248,10 @@ sap.ui.define([
 		 * object are limited to 31 characters each. If their value exceeds
 		 * this maximum length, the value will be truncated.
 		 *
-		 * @param {Object} mSettings - Export settings
-		 * @param {Object} mSettings.workbook - Spreadsheet properties
+		 * @param {object} mSettings - Export settings
+		 * @param {object} mSettings.workbook - Spreadsheet properties
 		 * @param {Array} mSettings.workbook.columns - Column configuration
-		 * @param {Object} [mSettings.workbook.context] - Export context that will be applied to the exported file
+		 * @param {object} [mSettings.workbook.context] - Export context that will be applied to the exported file
 		 * @param {string} [mSettings.workbook.context.application] - Application that created this XLSX
 		 * @param {string} [mSettings.workbook.context.version] - Application version that was used to create this XLSX
 		 * @param {string} [mSettings.workbook.context.title] - Title of the XLSX document (NOT the file name)
@@ -278,7 +278,7 @@ sap.ui.define([
 		 * @constructor The <code>sap.ui.export.Spreadsheet</code> class allows you to export table data from a UI5 application to a spreadsheet file.
 		 *
 		 * @author SAP SE
-		 * @version 1.100.0
+		 * @version 1.102.1
 		 *
 		 * @since 1.50
 		 * @name sap.ui.export.Spreadsheet
@@ -331,7 +331,7 @@ sap.ui.define([
 		 *
 		 * @function
 		 * @name sap.ui.export.Spreadsheet#setDefaultExportSettings
-		 * @param {Object} mParameters - Export parameters object
+		 * @param {object} mParameters - Export parameters object
 		 * @returns {Promise} Promise object
 		 * @private
 		 */
@@ -396,7 +396,7 @@ sap.ui.define([
 		 * the ODataMetaModel and attaches it to the export settings.
 		 *
 		 * @param {sap.ui.model.odata.ODataMetaModel} oMetaModel - ODataMetaModel instance that is used to request service specific code lists.
-		 * @param {Object} mSettings - Export settings that will receive the code lists
+		 * @param {object} mSettings - Export settings that will receive the code lists
 		 * @returns {Promise} The returned Promise will always resolve with an Array
 		 */
 		Spreadsheet.requestCodeLists = function(oMetaModel) {
@@ -415,14 +415,17 @@ sap.ui.define([
 
 		/**
 		 * The <code>beforeSave</code> event is fired just before the generated file is saved to the file system.
+		 * This event allows you to prevent the default action that closes the <code>ExportDialog</code> and
+		 * saves the file to your local device. If the default is prevented, the event handler is responsible
+		 * for closing and destroying the <code>Dialog</code>.
 		 *
 		 * @name sap.ui.export.Spreadsheet#beforeSave
 		 * @event
 		 * @param {sap.ui.base.Event} oEvent
 		 * @param {sap.ui.base.EventProvider} oEvent.getSource
 		 * @param {object} oEvent.getParameters
-		 *
 		 * @param {ArrayBuffer} oEvent.getParameter.data The data parameter contains the generated file
+		 * @param {sap.ui.export.ExportDialog} oEvent.getParameter.exportDialog The export dialog instance
 		 *
 		 * @since 1.61
 		 * @public
@@ -488,6 +491,15 @@ sap.ui.define([
 			return this;
 		};
 
+		/**
+		 * Returns the specific MIME type
+		 *
+		 * @returns {string} MIME type for Office Open XML Spreadsheet
+		 */
+		Spreadsheet.prototype.getMimeType = function() {
+			return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+		};
+
 		/**
 		 * Progress callback. The function is called when the progress status changes.
 		 *
@@ -512,7 +524,7 @@ sap.ui.define([
 		 * Creates a valid dataSource configuration
 		 *
 		 * @param {sap.ui.model.ListBinding|sap.ui.model.TreeBinding} oBinding - A subclass of <code>sap.ui.model.ListBinding</code> or <code>sap.ui.model.TreeBinding</code>
-		 * @returns {Object} - Valid data source configuration built upon the ListBinding
+		 * @returns {object} - Valid data source configuration built upon the ListBinding
 		 */
 		Spreadsheet.prototype.createDataSourceFromBinding = function(oBinding) {
 			/**
@@ -577,7 +589,7 @@ sap.ui.define([
 		 * @param {string|Array|Object|sap.ui.model.ListBinding|sap.ui.model.TreeBinding} oDataSource Possible types are a plain
 		 *        string that contains an URL of an OData service, an array of JSON objects, a data source configuration,
 		 *        a <code>sap.ui.model.ListBinding</code> or <code>sap.ui.model.TreeBinding</code>
-		 * @returns {Object|null} - Valid dataSource object or null in case the dataSource configuration is not supported
+		 * @returns {object|null} - Valid dataSource object or null in case the dataSource configuration is not supported
 		 *
 		 * @since 1.73
 		 * @public
@@ -625,7 +637,7 @@ sap.ui.define([
 		 *
 		 * @function
 		 * @name sap.ui.export.Spreadsheet#createBuildPromise
-		 * @param {Object} mParameters - Export parameters object
+		 * @param {object} mParameters - Export parameters object
 		 * @returns {Promise} Promise object
 		 * @private
 		 */
@@ -662,20 +674,21 @@ sap.ui.define([
 						}
 
 						var executeDefaultAction = that.fireEvent('beforeSave', {
-							data: oMessage.spreadsheet
+							data: oMessage.spreadsheet,
+							exportDialog: progressDialog
 						}, true, true);
 
-						/*
-						 * Keep the progress dialog open for 1 second to avoid
-						 * screen flickering in case of extremely fast exports
-						 */
-						if (progressDialog) {
-							window.setTimeout(progressDialog.finish, 1000);
-						}
-
 						if (executeDefaultAction) {
+							/*
+							* Keep the progress dialog open for 1 second to avoid
+							* screen flickering in case of extremely fast exports
+							*/
+							if (progressDialog) {
+								window.setTimeout(progressDialog.finish, 1000);
+							}
+
 							ExportUtils.saveAsFile(new Blob([oMessage.spreadsheet], {
-								type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+								type: that.getMimeType()
 							}), mParameters.fileName);
 						}
 

package/src/sap/ui/export/SpreadsheetExport.js

@@ -22,7 +22,7 @@ sap.ui.define(['sap/base/Log', 'sap/ui/export/ExportUtils'], function(Log, Expor
 	 *
 	 * @namespace
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.102.1
 	 *
 	 * @private
 	 * @since 1.50.0

package/src/sap/ui/export/fragments/SettingsDialog.fragment.xml

@@ -4,46 +4,56 @@
 			<Label text="{i18n>FILE_NAME}" labelFor="exportSettingsDialog-fileName"/>
 			<Input id="exportSettingsDialog-fileName" value="{/fileName}" liveChange=".onFileNameChange" class="sapUiTinyMarginBottom"/>
 
-			<Label text="{i18n>SELECT_FORMAT}" labelFor="exportSettingsDialog-fileType" visible="{/devMode}"/>
-			<Select id="exportSettingsDialog-fileType" selectedKey="{/selectedFileType}" items="{path: '/fileType'}" change=".onFileTypeChange" width="100%" visible="{/devMode}">
+			<Label text="{i18n>SELECT_FORMAT}" labelFor="exportSettingsDialog-fileType"/>
+			<Select id="exportSettingsDialog-fileType" selectedKey="{/fileType}" items="{path: '/fileTypeCollection'}" change=".onFileTypeChange" width="100%" class="sapUiTinyMarginBottom">
 				<items>
 					<core:Item key="{key}" text="{text}"/>
 				</items>
 			</Select>
 
-			<CheckBox id="exportSettingsDialog-includeFilterSettings" selected="{/includeFilterSettings}" text="{i18n>INCLUDE_FILTER_SETTINGS}"/>
-			<CheckBox id="exportSettingsDialog-splitCells" selected="{/splitCells}" text="{i18n>SPLIT_CELLS}" visible="{path:'/selectedFileType', formatter: '.isXLSX'}"/> <!-- Will be hidden in case of PDF because it needs to be true always -->
+			<Label text="{i18n>SELECT_DESTINATION}" labelFor="exportSettingsDialog-destination" visible="{parts: ['/fileType', '/destinationCollection'], formatter: '.hasDestinations'}"/>
+			<Select id="exportSettingsDialog-destination" selectedKey="{/destination}" items="{path: '/destinationCollection'}" visible="{parts: ['/fileType', '/destinationCollection'], formatter: '.hasDestinations'}" width="100%" class="sapUiTinyMarginBottom">
+				<items>
+					<core:Item key="{key}" text="{text}"/>
+				</items>
+			</Select>
+
+			<CheckBox id="exportSettingsDialog-includeFilterSettings" selected="{/includeFilterSettings}" text="{i18n>INCLUDE_FILTER_SETTINGS}"  visible="{path:'/fileType', formatter: '.isXLSX'}"/>
+			<CheckBox id="exportSettingsDialog-includeFilterSettings-PDF" enabled="{/capabilities/PDF/CoverPage}"  selected="{/includeFilterSettings}" text="{i18n>INCLUDE_FILTER_SETTINGS}"  visible="{path:'/fileType', formatter: '.isPDF'}" tooltip="{i18n>TOOLTIP_FILTER_SETTINGS}"/>
+			<CheckBox id="exportSettingsDialog-pdfArchive" enabled="{/capabilities/PDF/ArchiveFormat}" selected="{/pdfArchive}" text="{i18n>ARCHIVE_FORMAT}"  visible="{path:'/fileType', formatter: '.isPDF'}" tooltip="{i18n>TOOLTIP_ARCHIVE_FORMAT}"/>
+			<CheckBox id="exportSettingsDialog-splitCells" selected="{/splitCells}" text="{i18n>SPLIT_CELLS}" visible="{path:'/fileType', formatter: '.isXLSX'}"/> <!-- Will be hidden in case of PDF because it needs to be always true -->
 			<CheckBox id="exportSettingsDialog-addDateTime" selected="{/addDateTime}" text="{i18n>ADD_DATE_TIME}" visible="false"/>
 
 			<!-- PDF Specific settings -->
-			<Label text="{i18n>PAPER_SIZE}" labelFor="exportSettingsDialog-papersize" visible="{path:'/selectedFileType', formatter: '.isPDF'}"/>
-			<Select id="exportSettingsDialog-papersize" selectedKey="{/selectedPaperSize}" items="{path: '/paperSize'}" width="100%" visible="{path:'/selectedFileType', formatter: '.isPDF'}">
+			<Label text="{i18n>PAPER_SIZE}" labelFor="exportSettingsDialog-papersize" visible="{path:'/fileType', formatter: '.isPDF'}"/>
+			<Select id="exportSettingsDialog-papersize" selectedKey="{/paperSize}" items="{path: '/paperSizeCollection'}" width="100%" visible="{path:'/fileType', formatter: '.isPDF'}" class="sapUiTinyMarginBottom">
 				<items>
 					<core:Item key="{key}" text="{text}"/>
 				</items>
 			</Select>
 
-			<Label text="{i18n>ORIENTATION}" labelFor="exportSettingsDialog-orientation" visible="{path:'/selectedFileType', formatter: '.isPDF'}"/>
-			<Select id="exportSettingsDialog-orientation" selectedKey="{/selectedOrientation}" items="{path: '/orientation'}" width="100%" visible="{path:'/selectedFileType', formatter: '.isPDF'}">
+			<Label text="{i18n>ORIENTATION}" labelFor="exportSettingsDialog-orientation" visible="{path:'/fileType', formatter: '.isPDF'}"/>
+			<Select id="exportSettingsDialog-orientation" selectedKey="{/orientation}" items="{path: '/orientationCollection'}" width="100%" visible="{path:'/fileType', formatter: '.isPDF'}" class="sapUiTinyMarginBottom">
 				<items>
 					<core:Item key="{key}" text="{text}"/>
 				</items>
 			</Select>
 
-			<Label text="{i18n>FONT_SIZE}" labelFor="exportSettingsDialog-fontSize" visible="{path:'/selectedFileType', formatter: '.isPDF'}"/>
-			<Input id="exportSettingsDialog-fontSize" value="{/fontSize}" liveChange=".onFontSizeChange" class="sapUiTinyMarginBottom" visible="{path:'/selectedFileType', formatter: '.isPDF'}"/>
+			<Label text="{i18n>FONT_SIZE}" labelFor="exportSettingsDialog-fontSize" visible="{path:'/fileType', formatter: '.isPDF'}"/>
+			<Input id="exportSettingsDialog-fontSize" value="{/fontSize}" enabled="{/capabilities/PDF/FontSize}" liveChange=".onFontSizeChange" class="sapUiTinyMarginBottom" visible="{path:'/fileType', formatter: '.isPDF'}" tooltip="{i18n>TOOLTIP_FONT_SIZE}"/>
 
-			<CheckBox id="exportSettingsDialog-accessibility" enabled="{/accessibilitySupported}" selected="{/doEnableAccessibility}" text="{i18n>ENABLE_ACCESSIBILITY}" tooltip="{i18n>TOOLTIP_PDF_ACCESSIBILITY}" visible="{path:'/selectedFileType', formatter: '.isPDF'}"/>
-			<CheckBox id="exportSettingsDialog-signature" enabled="{/signatureSupported}" selected="{/signature}" text="{i18n>ENABLE_SIGNATURE}" tooltip="{i18n>TOOLTIP_PDF_SIGNATURE}" visible="{path:'/selectedFileType', formatter: '.isPDF'}"/>
+			<CheckBox id="exportSettingsDialog-accessibility" selected="{/doEnableAccessibility}" text="{i18n>ENABLE_ACCESSIBILITY}" tooltip="{i18n>TOOLTIP_PDF_ACCESSIBILITY}" visible="{path:'/fileType', formatter: '.isPDF'}"/>
+			<CheckBox id="exportSettingsDialog-fitToPage" enabled="{/capabilities/PDF/FitToPage}" selected="{/fitToPage}" text="{i18n>FITTOPAGE}" tooltip="{i18n>TOOLTIP_FITTOPAGE}" visible="{path:'/fileType', formatter: '.isPDF'}"/>
+			<CheckBox id="exportSettingsDialog-signature" enabled="{/capabilities/PDF/Signature}" selected="{/signature}" text="{i18n>ENABLE_SIGNATURE}" tooltip="{i18n>TOOLTIP_PDF_SIGNATURE}" visible="{path:'/fileType', formatter: '.isPDF'}"/>
 
 			<Label id="exportSettingsDialog-signatureReasonLabel" text="{i18n>SIGNATURE_REASON}" labelFor="exportSettingsDialog-signatureReason" visible="{/signature}"/>
 			<Input id="exportSettingsDialog-signatureReason" value="{/signatureReason}" class="sapUiTinyMarginBottom" visible="{/signature}"/>
 		</VBox>
 	</content>
 	<beginButton>
-		<Button id="exportSettingsDialog-exportButton" press=".onExport" text="{i18n>EXPORT_BUTTON}" type="Emphasized"/>
+		<Button id="exportSettingsDialog-exportButton" press=".onExport" text="{path:'/destination', formatter:'.formatExportButton'}" type="Emphasized"/>
 	</beginButton>
 	<endButton>
-		<Button id="exportSettingsDialog-cancelButton" press=".onCancel" text="{i18n>CANCEL_BUTTON}"/>
+		<Button id="exportSettingsDialog-cancelButton" press=".onCancel" text="{i18n>CANCEL_BUTTON}" type="Transparent"/>
 	</endButton>
 </Dialog>